Fixed middleware setting fallback in compatibility function. Take 2

czpython · czpython · commit 8003cd225e9c · 2017-09-05T18:15:28.000-04:00
diff --git a/cms/utils/compat/dj.py b/cms/utils/compat/dj.py
@@ -30,6 +30,6 @@ def get_apps():
 
 
 def get_middleware():
-    # order is important.
-    # django sets MIDDLEWARE to None which prevents MIDDLEWARE_CLASSES from being used.
-    return getattr(settings, 'MIDDLEWARE_CLASSES', getattr(settings, 'MIDDLEWARE'))
+    if getattr(settings, 'MIDDLEWARE', None) is None:
+        return settings.MIDDLEWARE_CLASSES
+    return settings.MIDDLEWARE
