mirror of
https://github.com/django/django.git
synced 2025-07-19 09:09:13 +00:00
[1.0.X] Fixed a bug introduced in r9443.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9447 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
781a1763d9
commit
087f8aa781
@ -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…
x
Reference in New Issue
Block a user