diff options
| author | Marten Kenbeek <marten.knbk@gmail.com> | 2015-10-26 14:28:05 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-10-26 10:42:20 -0400 |
| commit | 34af2bc523321da828a02bcf8f225ec393ed75cf (patch) | |
| tree | 2affe2d857ee25d31a8732904e2f58e4ca57c457 /django | |
| parent | 23073f964442ff754a28cb218e2f37425ebaef15 (diff) | |
Fixed #25610 -- Reverted removal of request.current_app in {% url %} tag.
The deprecation removal in 5e450c52aafb62b9d83c8ac08892e0b92cbec4aa
removed too much.
Diffstat (limited to 'django')
| -rw-r--r-- | django/template/defaulttags.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index 08ef976be1..2934f5756e 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -434,9 +434,12 @@ class URLNode(Node): } view_name = self.view_name.resolve(context) try: - current_app = context.request.resolver_match.namespace + current_app = context.request.current_app except AttributeError: - current_app = None + try: + current_app = context.request.resolver_match.namespace + except AttributeError: + current_app = None # Try to look up the URL. If it fails, raise NoReverseMatch unless the # {% url ... as var %} construct is used, in which case return nothing. url = '' |
