summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/contrib/flatpages/middleware.py3
1 files changed, 3 insertions, 0 deletions
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