Resolves Jira OSQA-359, adding an option to allow negative user reputation in the...

[osqa.git] / settings.py

diff --git a/settings.py b/settings.py
index de55240cddc405043605566ad30ec53675b33c6c..f1c6f6b29a257f30730762bfb1194236409e4cc4 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -15,6 +15,7 @@ TEMPLATE_LOADERS = [
 ]
 
 MIDDLEWARE_CLASSES = [
 ]
 
 MIDDLEWARE_CLASSES = [

+    'forum.middleware.django_cookies.CookiePreHandlerMiddleware',

     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'forum.middleware.extended_user.ExtendedUser',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'forum.middleware.extended_user.ExtendedUser',


@@ -23,7 +24,21 @@ MIDDLEWARE_CLASSES = [
     'forum.middleware.cancel.CancelActionMiddleware',
     'forum.middleware.admin_messages.AdminMessagesMiddleware',
     'django.middleware.transaction.TransactionMiddleware',
     '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',
 
 TEMPLATE_CONTEXT_PROCESSORS = [
     'django.core.context_processors.request',