From d0f57e7c7385a112cb9e19d314352fc5ed5b0747 Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Tue, 5 Aug 2008 17:45:31 +0000 Subject: [PATCH] Fixed #6213: flatpage view now correctly redirects if settings.APPEND_SLASH. Thanks, crankycoder. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8218 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/flatpages/views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/django/contrib/flatpages/views.py b/django/contrib/flatpages/views.py index 1e451bdecc..0517fc44d6 100644 --- a/django/contrib/flatpages/views.py +++ b/django/contrib/flatpages/views.py @@ -1,7 +1,7 @@ from django.contrib.flatpages.models import FlatPage from django.template import loader, RequestContext from django.shortcuts import get_object_or_404 -from django.http import HttpResponse +from django.http import HttpResponse, HttpResponseRedirect from django.conf import settings from django.core.xheaders import populate_xheaders from django.utils.safestring import mark_safe @@ -19,6 +19,8 @@ def flatpage(request, url): flatpage `flatpages.flatpages` object """ + if not url.endswith('/') and settings.APPEND_SLASH: + return HttpResponseRedirect(url + "/") if not url.startswith('/'): url = "/" + url f = get_object_or_404(FlatPage, url__exact=url, sites__id__exact=settings.SITE_ID)