Should fix the missing admin items problem.

[osqa.git] / settings.py

diff --git a/settings.py b/settings.py
index 471b5495e54bb05d6cd19ad0c80e92266b2efcc8..041f6ae286661c8b17afed686f4df556a44972aa 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -15,6 +15,9 @@ TEMPLATE_LOADERS = [
 ]
 
 MIDDLEWARE_CLASSES = [
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.middleware.csrf.CsrfResponseMiddleware',
+    'forum.middleware.django_cookies.CookiePreHandlerMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'forum.middleware.extended_user.ExtendedUser',
@@ -23,20 +26,8 @@ MIDDLEWARE_CLASSES = [
     'forum.middleware.cancel.CancelActionMiddleware',
     'forum.middleware.admin_messages.AdminMessagesMiddleware',
     'django.middleware.transaction.TransactionMiddleware',
+    'forum.middleware.django_cookies.CookiePostHandlerMiddleware',
 ]
-# Backwards compatibility. If we fail to import the CSRF middle-ware from the location
-# where it is supposed to be, we add the old middle-ware classes to the classes list.
-try:
-    from django.middleware.csrf import CsrfViewMiddleware
-    MIDDLEWARE_CLASSES = [
-        'django.middleware.csrf.CsrfViewMiddleware',
-        'django.middleware.csrf.CsrfResponseMiddleware',
-    ] + MIDDLEWARE_CLASSES
-except ImportError:
-    MIDDLEWARE_CLASSES = [
-        'django.contrib.csrf.middleware.CsrfViewMiddleware',
-        'django.contrib.csrf.middleware.CsrfResponseMiddleware',
-    ] + MIDDLEWARE_CLASSES
 
 TEMPLATE_CONTEXT_PROCESSORS = [
     'django.core.context_processors.request',