summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamir Shah <solaris.smoke@gmail.com>2016-06-21 15:12:07 +0300
committerTim Graham <timograham@gmail.com>2016-06-21 08:12:07 -0400
commitfff5dbe59ca629c295480693f045f03537858eee (patch)
treecc1d9ffe8a830aa3645695189f82636bfb585199
parent4e400dcb79bc468ee1ff899312a00ed8dc3e795c (diff)
Corrected firstof template tag's docstring.
Since Django 1.8, firstof escapes its output.
-rw-r--r--django/template/defaulttags.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index 41ecd0c7d2..bfe00ca83d 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -681,7 +681,7 @@ def do_filter(parser, token):
@register.tag
def firstof(parser, token):
"""
- Outputs the first variable passed that is not False, without escaping.
+ Outputs the first variable passed that is not False.
Outputs nothing if all the passed variables are False.
@@ -692,11 +692,11 @@ def firstof(parser, token):
This is equivalent to::
{% if var1 %}
- {{ var1|safe }}
+ {{ var1 }}
{% elif var2 %}
- {{ var2|safe }}
+ {{ var2 }}
{% elif var3 %}
- {{ var3|safe }}
+ {{ var3 }}
{% endif %}
but obviously much cleaner!