Fixed a bug introduced in r9422.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9446 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
f63929dbe2
commit
ec8150e78a
|
@ -485,6 +485,7 @@ def join(value, arg, autoescape=None):
|
||||||
"""
|
"""
|
||||||
Joins a list with a string, like Python's ``str.join(list)``.
|
Joins a list with a string, like Python's ``str.join(list)``.
|
||||||
"""
|
"""
|
||||||
|
value = map(force_unicode, value)
|
||||||
if autoescape:
|
if autoescape:
|
||||||
from django.utils.html import conditional_escape
|
from django.utils.html import conditional_escape
|
||||||
value = [conditional_escape(v) for v in value]
|
value = [conditional_escape(v) for v in value]
|
||||||
|
|
Loading…
Reference in New Issue