diff -r 6641e941ef1e -r ff1a9aa48cfd app/django/contrib/flatpages/middleware.py
--- a/app/django/contrib/flatpages/middleware.py	Tue Oct 14 12:36:55 2008 +0000
+++ b/app/django/contrib/flatpages/middleware.py	Tue Oct 14 16:00:59 2008 +0000
@@ -7,7 +7,7 @@
         if response.status_code != 404:
             return response # No need to check for a flatpage for non-404 responses.
         try:
-            return flatpage(request, request.path)
+            return flatpage(request, request.path_info)
         # 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: