Try to import the new Django CSRF middleware, otherwise add the old Django 1.1 CSRF...

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1018 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/settings.py b/settings.py
index bdd2934a07250846193497f3de59f92dffab3511..471b5495e54bb05d6cd19ad0c80e92266b2efcc8 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -15,8 +15,6 @@ TEMPLATE_LOADERS = [
 ]
 
 MIDDLEWARE_CLASSES = [
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.middleware.csrf.CsrfResponseMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'forum.middleware.extended_user.ExtendedUser',
@@ -26,6 +24,19 @@ MIDDLEWARE_CLASSES = [
     'forum.middleware.admin_messages.AdminMessagesMiddleware',
     'django.middleware.transaction.TransactionMiddleware',
 ]
+# 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',