Merge branch 'master' into forum

[edumed.git] / edumed / settings.d / 40-middleware.py

diff --git a/edumed/settings.d/40-middleware.py b/edumed/settings.d/40-middleware.py
index b211d42..b9c614d 100644 (file)
--- a/edumed/settings.d/40-middleware.py
+++ b/edumed/settings.d/40-middleware.py
@@ -1,4 +1,5 @@
 MIDDLEWARE_CLASSES = tuple(x for x in (
+    'django.middleware.cache.UpdateCacheMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware'
             if "django.contrib.sessions" in INSTALLED_APPS else None,
     #'django.middleware.locale.LocaleMiddleware',
@@ -6,6 +7,7 @@ MIDDLEWARE_CLASSES = tuple(x for x in (
 
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
+    'honeypot.middleware.HoneypotMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware'
             if "django.contrib.auth" in INSTALLED_APPS else None,
     'django_cas.middleware.CASMiddleware'
@@ -18,5 +20,8 @@ MIDDLEWARE_CLASSES = tuple(x for x in (
     # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'pagination.middleware.PaginationMiddleware'
             if "pagination" in INSTALLED_APPS else None,
-    'fnpdjango.middleware.SetRemoteAddrFromXRealIP'
+    'django.middleware.cache.FetchFromCacheMiddleware',
+    'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
+    'pybb.middleware.PybbMiddleware',
+    'forum.middleware.ForumMiddleware'
 ) if x is not None)