summaryrefslogtreecommitdiff
path: root/django
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:33 -0400
commit040d6055a27815350c69817bc5c15df96e70c4bb (patch)
treed00ae42169f32aeebe458c66ee1616523380317f /django
parent2ff72962a633001a1ee44838a82d68dfcf04dd32 (diff)
[1.9.x] Corrected firstof template tag's docstring.
Since Django 1.8, firstof escapes its output. Backport of fff5dbe59ca629c295480693f045f03537858eee from master
Diffstat (limited to 'django')
-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 e2d2882701..fe0542fd06 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -756,7 +756,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.
@@ -767,11 +767,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!