p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #24046 -- Removed redundant condition in render_value_in_context() 

Calling conditional_escape() on SafeData won't change it.
This commit is contained in:
Tim Graham 2016-01-24 13:41:25 -05:00
parent 49c57f8565
commit bf3057d10b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/template/base.py
View File

@ -1012,8 +1012,7 @@ def render_value_in_context(value, context):
value = template_localtime(value, use_tz=context.use_tz) value = template_localtime(value, use_tz=context.use_tz)
value = localize(value, use_l10n=context.use_l10n) value = localize(value, use_l10n=context.use_l10n)
value = force_text(value) value = force_text(value)
if ((context.autoescape and not isinstance(value, SafeData)) or if context.autoescape or isinstance(value, EscapeData):
isinstance(value, EscapeData)):
return conditional_escape(value) return conditional_escape(value)
else: else:
return value return value