Commit 087f8aa7 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

[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
parent 781a1763

django/template/defaultfilters.py

+1 −0
Original line number Diff line number Diff line
@@ -485,6 +485,7 @@ def join(value, arg, autoescape=None): 
    """

    Joins a list with a string, like Python's ``str.join(list)``.

    """

    value = map(force_unicode, value)

    if autoescape:

        from django.utils.html import conditional_escape

        value = [conditional_escape(v) for v in value]