fix positioning of strip piwik cookie middleware

diff --git a/panikweb/settings.py b/panikweb/settings.py
index f9c1b99e4e27467f074ea122a1a4ee068063e95e..d2522bf78004237ab5a610608a01c47bd88f4db1 100644 (file)
--- a/panikweb/settings.py
+++ b/panikweb/settings.py
@@ -111,6 +111,7 @@ MIDDLEWARE_CLASSES = (
     'fiber.middleware.ObfuscateEmailAddressMiddleware',
     'fiber.middleware.AdminPageMiddleware',
     #'request.middleware.RequestMiddleware',
     'fiber.middleware.ObfuscateEmailAddressMiddleware',
     'fiber.middleware.AdminPageMiddleware',
     #'request.middleware.RequestMiddleware',

+    'panikweb.middleware.StripPiwikCookieMiddleware',

     'django.middleware.cache.FetchFromCacheMiddleware',
 )
 
     'django.middleware.cache.FetchFromCacheMiddleware',
 )
 


@@ -214,8 +215,9 @@ if DEBUG and DEBUG_TOOLBAR:
         'INTERCEPT_REDIRECTS': False,
     }
 
         'INTERCEPT_REDIRECTS': False,
     }
 

-if ENABLE_PIWIK:
-    MIDDLEWARE_CLASSES += ('panikweb.middleware.StripPiwikCookieMiddleware',)
+if ENABLE_PIWIK is False:
+    MIDDLEWARE_CLASSES = tuple([x for x in MIDDLEWARE_CLASSES \
+                                if x != 'panikweb.middleware.StripPiwikCookieMiddleware'])

 
 if STATSD_CLIENT != 'django_statsd.clients.null':
     MIDDLEWARE_CLASSES = (
 
 if STATSD_CLIENT != 'django_statsd.clients.null':
     MIDDLEWARE_CLASSES = (