Merge branch 'master' of github.com:django/djangoproject.com

django · Sep 15, 2011 · dd7d2e7 · dd7d2e7
2 parents a0422b0 + c43780f
commit dd7d2e7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/django_website/settings/www.py b/django_website/settings/www.py
@@ -89,6 +89,7 @@
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.common.CommonMiddleware',
+    'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
     'django.contrib.redirects.middleware.RedirectFallbackMiddleware',
 ]
 if PRODUCTION:

diff --git a/django_website/urls/www.py b/django_website/urls/www.py
@@ -66,8 +66,3 @@
             "document_root": settings.MEDIA_ROOT,
         }),
     )
-
-# flatpages need to be last b/c they match anything
-urlpatterns += patterns('',
-    (r'', include('django.contrib.flatpages.urls')),
-)