summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2012-03-02 16:55:56 +0000
committerJannis Leidel <jannis@leidel.info>2012-03-02 16:55:56 +0000
commit4887a8de170ad9227d79f39f5bd3d2564f4e7ef8 (patch)
treecb70d0b3fe4ce9fef5bf805ca140500f693e8246 /django
parent7b624c6c3205094b4fbf2ef2b7164ff7668665a5 (diff)
Fixed #16842 -- Modified the RedirectView to correctly handle query strings with percent symbols. Thanks, accuser, jamey@minilop.net and Claude Paroz.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/views/generic/base.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/django/views/generic/base.py b/django/views/generic/base.py
index 6dfbc7a9da..fcdc7c785b 100644
--- a/django/views/generic/base.py
+++ b/django/views/generic/base.py
@@ -139,12 +139,11 @@ class RedirectView(View):
are provided as kwargs to this method.
"""
if self.url:
+ url = self.url % kwargs
args = self.request.META.get('QUERY_STRING', '')
if args and self.query_string:
- url = "%s?%s" % (self.url, args)
- else:
- url = self.url
- return url % kwargs
+ url = "%s?%s" % (url, args)
+ return url
else:
return None