From 09f32294e8a6b9f65bca44c252f78a904e9c3515 Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Sun, 20 Nov 2005 04:55:57 +0000
Subject: [PATCH] Fixed #845 -- flatpages middleware no longer throws 404
exception for DEBUG=True. Thanks, Hugo
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1296 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
django/contrib/flatpages/middleware.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/django/contrib/flatpages/middleware.py b/django/contrib/flatpages/middleware.py
index 9c4e0bb44e..c6f286563d 100644
--- a/django/contrib/flatpages/middleware.py
+++ b/django/contrib/flatpages/middleware.py
@@ -1,4 +1,5 @@
from django.contrib.flatpages.views import flatpage
+from django.core.extensions import Http404
from django.conf.settings import DEBUG
class FlatpageFallbackMiddleware:
@@ -9,6 +10,8 @@ class FlatpageFallbackMiddleware:
return flatpage(request, request.path)
# Return the original response if any errors happened. Because this
# is a middleware, we can't assume the errors will be caught elsewhere.
+ except Http404:
+ return response
except:
if DEBUG:
raise