Changeset 6706

Timestamp:

11/19/07 19:37:57 (11 months ago)

Author:

mtredinnick

Message:

Fixed #5983 -- Made iriencode filter respect safe strings. Patch from
SmileyChris?.

Files:

• django/trunk/django/template/defaultfilters.py (modified) (1 diff)
• django/trunk/tests/regressiontests/templates/filters.py (modified) (1 diff)

django/trunk/django/template/defaultfilters.py

@@ -107 +107 @@
-    """Escapes an IRI value for use in a URL."""
-    return force_unicode(iri_to_uri(value))
+iriencode.is_safe = True
-iriencode = stringfilter(iriencode)
-

django/trunk/tests/regressiontests/templates/filters.py

@@ -199 +199 @@
-        'filter-phone2numeric02': ('{% autoescape off %}{{ a|phone2numeric }} {{ b|phone2numeric }}{% endautoescape %}', {"a": "<1-800-call-me>", "b": mark_safe("<1-800-call-me>") }, "<1-800-2255-63> <1-800-2255-63>"),
-
+        # Ensure iriencode keeps safe strings:
+        'filter-iriencode01': ('{{ url|iriencode }}', {'url': '?test=1&me=2'}, '?test=1&amp;me=2'),
+        'filter-iriencode02': ('{% autoescape off %}{{ url|iriencode }}{% endautoescape %}', {'url': '?test=1&me=2'}, '?test=1&me=2'),
+        'filter-iriencode03': ('{{ url|iriencode }}', {'url': mark_safe('?test=1&me=2')}, '?test=1&me=2'),
+        'filter-iriencode04': ('{% autoescape off %}{{ url|iriencode }}{% endautoescape %}', {'url': mark_safe('?test=1&me=2')}, '?test=1&me=2'),
+
-        # Chaining a bunch of safeness-preserving filters should not alter
-        # the safe status either way.