test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed always True if check in stringfilter decorator.

This commit is contained in:
Mads Jensen 2017-09-30 18:13:30 +02:00 committed by Tim Graham
parent fd866c25d1
commit 77d1b19623
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/template/defaultfilters.py
View File

@ -37,12 +37,11 @@ def stringfilter(func):
passed as the first positional argument will be converted to a string. passed as the first positional argument will be converted to a string.
""" """
def _dec(*args, **kwargs): def _dec(*args, **kwargs):
if args: args = list(args)
args = list(args) args[0] = str(args[0])
args[0] = str(args[0]) if (isinstance(args[0], SafeData) and
if (isinstance(args[0], SafeData) and getattr(_dec._decorated_function, 'is_safe', False)):
getattr(_dec._decorated_function, 'is_safe', False)): return mark_safe(func(*args, **kwargs))
return mark_safe(func(*args, **kwargs))
return func(*args, **kwargs) return func(*args, **kwargs)
# Include a reference to the real function (used to check original # Include a reference to the real function (used to check original