summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2008-08-25 12:57:24 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2008-08-25 12:57:24 +0000
commite206eabc68c6dbb018195291afd5722fe7493200 (patch)
treec9f477a06716d42adc63d3ba4c6a46ca5e388bfb
parent3df72660560730393fc958700d2a3ab975c4b361 (diff)
Fixed #7317: the x-view middleware is no longer enabled by default.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8537 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/global_settings.py1
-rw-r--r--django/conf/project_template/settings.py1
2 files changed, 0 insertions, 2 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index c52d8d9a89..2c48571787 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -300,7 +300,6 @@ MIDDLEWARE_CLASSES = (
# 'django.middleware.http.ConditionalGetMiddleware',
# 'django.middleware.gzip.GZipMiddleware',
'django.middleware.common.CommonMiddleware',
- 'django.middleware.doc.XViewMiddleware',
)
############
diff --git a/django/conf/project_template/settings.py b/django/conf/project_template/settings.py
index 5c4a7cc5fa..bbf005ddea 100644
--- a/django/conf/project_template/settings.py
+++ b/django/conf/project_template/settings.py
@@ -61,7 +61,6 @@ MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.middleware.doc.XViewMiddleware',
)
ROOT_URLCONF = '{{ project_name }}.urls'