Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #16230 -- Correctly escape errors message passed to ErrorDict. …

…Thanks, Gregor Müllegger.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16461 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit b9eb94e789c6f31047c6fa6b89654d0657605470 1 parent b4bd6bb
@jezdez jezdez authored
View
2  django/forms/util.py
@@ -27,7 +27,7 @@ def __unicode__(self):
def as_ul(self):
if not self: return u''
return mark_safe(u'<ul class="errorlist">%s</ul>'
- % ''.join([u'<li>%s%s</li>' % (k, force_unicode(v))
+ % ''.join([u'<li>%s%s</li>' % (k, conditional_escape(force_unicode(v)))
for k, v in self.items()]))
def as_text(self):
View
4 tests/regressiontests/forms/tests/util.py
@@ -55,3 +55,7 @@ def __unicode__(self): return u"A very bad error."
'<ul class="errorlist"><li>Example of link: &lt;a href=&quot;http://www.example.com/&quot;&gt;example&lt;/a&gt;</li></ul>')
self.assertEqual(str(ErrorList([mark_safe(example)])),
'<ul class="errorlist"><li>Example of link: <a href="http://www.example.com/">example</a></li></ul>')
+ self.assertEqual(str(ErrorDict({'name': example})),
+ '<ul class="errorlist"><li>nameExample of link: &lt;a href=&quot;http://www.example.com/&quot;&gt;example&lt;/a&gt;</li></ul>')
+ self.assertEqual(str(ErrorDict({'name': mark_safe(example)})),
+ '<ul class="errorlist"><li>nameExample of link: <a href="http://www.example.com/">example</a></li></ul>')

0 comments on commit b9eb94e

Please sign in to comment.
Something went wrong with that request. Please try again.