Ticket #6948: defaultfilters.patch

django/template/defaultfilters.py

@@ -11 +11 @@
 from django.conf import settings
 from django.utils.translation import ugettext, ungettext
 from django.utils.encoding import force_unicode, iri_to_uri
+from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe, SafeData
 
 register = Library()
@@ -442 +443 @@
         return u''
 first.is_safe = False
 
-def join(value, arg):
+def join(value, arg, autoescape=None):
     """Joins a list with a string, like Python's ``str.join(list)``."""
     try:
-        data = arg.join(map(force_unicode, value))
+        esc = autoescape and conditional_escape or (lambda x: x)
+        data = arg.join(map(esc, map(force_unicode, value)))
     except AttributeError: # fail silently but nicely
         return value
-    safe_args = reduce(lambda lhs, rhs: lhs and isinstance(rhs, SafeData),
-            value, True)
-    if safe_args:
-        return mark_safe(data)
-    else:
-        return data
+    return mark_safe(data)
 join.is_safe = True
+join.needs_autoescape = True
 
 def last(value):
     "Returns the last item in a list"