summaryrefslogtreecommitdiff
path: root/django/forms/util.py
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2008-11-06 19:49:24 +0000
committerKaren Tracey <kmtracey@gmail.com>2008-11-06 19:49:24 +0000
commitbcd63cbfb0590a2e2bed3e4beab3f467279ad3db (patch)
tree35a45e1f97562e1747b0c6458f14e8f11afd11b0 /django/forms/util.py
parent04354e1afcd5d4b4813282c4849017b89f66aa24 (diff)
Fixed #6160, #9111 -- Consistently apply conditional_escape to form errors and labels when outputing them as HTML.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9365 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/forms/util.py')
-rw-r--r--django/forms/util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/forms/util.py b/django/forms/util.py
index ea936277b0..b9b88a61e6 100644
--- a/django/forms/util.py
+++ b/django/forms/util.py
@@ -39,7 +39,7 @@ class ErrorList(list, StrAndUnicode):
def as_ul(self):
if not self: return u''
return mark_safe(u'<ul class="errorlist">%s</ul>'
- % ''.join([u'<li>%s</li>' % force_unicode(e) for e in self]))
+ % ''.join([u'<li>%s</li>' % conditional_escape(force_unicode(e)) for e in self]))
def as_text(self):
if not self: return u''