From d05d724165413c923de9094e3ecf5dd652f6c0c5 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Thu, 21 Aug 2008 01:40:22 +0000 Subject: [PATCH] Fixed #8376 -- Use request.path and request.path_info at the right moments when serving data in the flatpage middleware. Patch from jcassee. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8457 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/flatpages/middleware.py | 2 +- django/contrib/flatpages/views.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/django/contrib/flatpages/middleware.py b/django/contrib/flatpages/middleware.py index 231b5fdd5c..fb98c39a9e 100644 --- a/django/contrib/flatpages/middleware.py +++ b/django/contrib/flatpages/middleware.py @@ -7,7 +7,7 @@ class FlatpageFallbackMiddleware(object): 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: diff --git a/django/contrib/flatpages/views.py b/django/contrib/flatpages/views.py index 0517fc44d6..37d12c93a3 100644 --- a/django/contrib/flatpages/views.py +++ b/django/contrib/flatpages/views.py @@ -20,7 +20,7 @@ def flatpage(request, url): `flatpages.flatpages` object """ if not url.endswith('/') and settings.APPEND_SLASH: - return HttpResponseRedirect(url + "/") + return HttpResponseRedirect("%s/" % request.path) if not url.startswith('/'): url = "/" + url f = get_object_or_404(FlatPage, url__exact=url, sites__id__exact=settings.SITE_ID)