Changeset 6721

Timestamp:

11/28/07 14:03:28 (1 year ago)

Author:

mtredinnick

Message:

Fixed an edge-case for auto-escaping: if the stringfilter decorator is used and
generates a first argument that is a safe string, make the is_safe handling
work as expect.

Files:

• django/trunk/django/template/defaultfilters.py (modified) (1 diff)

django/trunk/django/template/defaultfilters.py

@@ -26 +26 @@
-            args = list(args)
-            args[0] = force_unicode(args[0])
+        if isinstance(args[0], SafeData) and getattr(func, 'is_safe', False):
+            return mark_safe(func(*args, **kwargs))
-        return func(*args, **kwargs)
-