Ticket #8376: 8376-r8418-2.diff

django/contrib/flatpages/middleware.py

@@ -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:

django/contrib/flatpages/views.py

@@ -20 +20 @@
             `flatpages.flatpages` object
     """
     if not url.endswith('/') and settings.APPEND_SLASH:
-        return HttpResponseRedirect(url + "/")
+        return HttpResponseRedirect(request.path + "/")
     if not url.startswith('/'):
         url = "/" + url
     f = get_object_or_404(FlatPage, url__exact=url, sites__id__exact=settings.SITE_ID)