Merge branch 'master' into multi

Conflicts: docs/TODO
2011-03-16 04:59:31 -04:00
parent afde18f500 c9d82da28a
commit f78cbddb87
8 changed files with 30 additions and 19 deletions
--- a/settings.py
+++ b/settings.py
@@ -297,7 +297,7 @@ if DEVELOPMENT:

    try:
        import debug_toolbar
-        #INSTALLED_APPS.append('debug_toolbar')
+        #INSTALLED_APPS +=('debug_toolbar',)
    except ImportError:
        #print 'debug_toolbar is not installed'
        pass
@@ -306,7 +306,7 @@ if DEVELOPMENT:

    WSGI_AUTO_RELOAD = True
    if 'debug_toolbar' in INSTALLED_APPS:
-        MIDDLEWARE_CLASSES.append('debug_toolbar.middleware.DebugToolbarMiddleware')
+        MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
        DEBUG_TOOLBAR_CONFIG={
            'INTERCEPT_REDIRECTS' : False,
        }