p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #15683 -- Prevented escaped string to be needlessly marked safe twice in force_escape filter. Thanks tyrion for the initial patch. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Claude Paroz 2012-04-07 15:16:11 +00:00
parent 8663bc1103
commit 8dd04fd84b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/template/defaultfilters.py
View File

@ -419,7 +419,7 @@ def force_escape(value):
characters (as opposed to "escape", which marks the content for later characters (as opposed to "escape", which marks the content for later
possible escaping). possible escaping).
""" """
return mark_safe(escape(value)) return escape(value)
@register.filter("linebreaks", is_safe=True, needs_autoescape=True) @register.filter("linebreaks", is_safe=True, needs_autoescape=True)
@stringfilter @stringfilter

6
tests/regressiontests/defaultfilters/tests.py
View File

@ -6,6 +6,7 @@ import decimal
from django.template.defaultfilters import * from django.template.defaultfilters import *
from django.test import TestCase from django.test import TestCase
from django.utils import unittest, translation from django.utils import unittest, translation
from django.utils.safestring import SafeData
class DefaultFiltersTests(TestCase): class DefaultFiltersTests(TestCase):
@ -328,9 +329,10 @@ class DefaultFiltersTests(TestCase):
u'a string to be mangled') u'a string to be mangled')
def test_force_escape(self): def test_force_escape(self):
escaped = force_escape(u'<some html & special characters > here')
self.assertEqual( self.assertEqual(
force_escape(u'<some html & special characters > here'), escaped, u'&lt;some html &amp; special characters &gt; here')
u'&lt;some html &amp; special characters &gt; here') self.assertTrue(isinstance(escaped, SafeData))
self.assertEqual( self.assertEqual(
force_escape(u'<some html & special characters > here ĐÅ€£'), force_escape(u'<some html & special characters > here ĐÅ€£'),
u'&lt;some html &amp; special characters &gt; here'\ u'&lt;some html &amp; special characters &gt; here'\