summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authormlavin <markdlavin@gmail.com>2014-04-20 08:58:29 -0400
committerTim Graham <timograham@gmail.com>2014-06-13 12:45:56 -0400
commit4696cd9671243958fd4a596631d75b3cbca325c3 (patch)
treef6b77422bf80728fb278664ebdcb380da8543a80 /docs/ref
parentcc35bd461d35da2b03c0a1a8ff92123d716db9a9 (diff)
Fixed #22477 -- Removed contrib middleware from the global settings defaults.
Also added a compatibility check for changed middleware defaults. Forwardport of d94de802d3 from stable/1.7.x
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/settings.txt12
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 58cb7061b5..d9697a5bcb 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1734,13 +1734,17 @@ MIDDLEWARE_CLASSES
Default::
('django.middleware.common.CommonMiddleware',
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.middleware.csrf.CsrfViewMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.contrib.messages.middleware.MessageMiddleware',)
+ 'django.middleware.csrf.CsrfViewMiddleware',)
A tuple of middleware classes to use. See :doc:`/topics/http/middleware`.
+.. versionchanged:: 1.7
+
+ :class:`~django.contrib.sessions.middleware.SessionMiddleware`,
+ :class:`~django.contrib.auth.middleware.AuthenticationMiddleware`, and
+ :class:`~django.contrib.messages.middleware.MessageMiddleware` were removed
+ from this setting.
+
.. setting:: MIGRATION_MODULES
MIGRATION_MODULES