Ticket #14057: 14057-context-parameter.diff

django/template/__init__.py

@@ -828 +828 @@
     value = localize(value, use_l10n=context.use_l10n)
     value = force_unicode(value)
     if (context.autoescape and not isinstance(value, SafeData)) or isinstance(value, EscapeData):
-        return escape(value)
+        if callable(context.autoescape):
+            return context.autoescape(value)
+        else:
+            return escape(value)
     else:
         return value