diff options
| author | Tom Christie | 2014-06-12 12:09:29 +0100 |
|---|---|---|
| committer | Tom Christie | 2014-06-12 12:09:29 +0100 |
| commit | e11f41ebc4ef088a5849771dfda5a7fba4f82904 (patch) | |
| tree | 2334352e182c315bc4b6fa783f2ee6f568a58555 /rest_framework | |
| parent | 3dcc6585d21bddcb692ebbcb1985423e4ae6c086 (diff) | |
| parent | 82659873c9d3e3058b7e7ea63e4c4b190c7fc19c (diff) | |
| download | django-rest-framework-e11f41ebc4ef088a5849771dfda5a7fba4f82904.tar.bz2 | |
Merge pull request #1640 from tomchristie/escape-login-logout-paths2.3.14
Version 2.3.14
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/__init__.py | 2 | ||||
| -rw-r--r-- | rest_framework/templatetags/rest_framework.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 2d76b55d..01036cef 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ _ """ __title__ = 'Django REST framework' -__version__ = '2.3.13' +__version__ = '2.3.14' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2014 Tom Christie' diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index dff176d6..a155d8d2 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -122,7 +122,7 @@ def optional_login(request): except NoReverseMatch: return '' - snippet = "<a href='%s?next=%s'>Log in</a>" % (login_url, request.path) + snippet = "<a href='%s?next=%s'>Log in</a>" % (login_url, escape(request.path)) return snippet @@ -136,7 +136,7 @@ def optional_logout(request): except NoReverseMatch: return '' - snippet = "<a href='%s?next=%s'>Log out</a>" % (logout_url, request.path) + snippet = "<a href='%s?next=%s'>Log out</a>" % (logout_url, escape(request.path)) return snippet |