From bcd63cbfb0590a2e2bed3e4beab3f467279ad3db Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Thu, 6 Nov 2008 19:49:24 +0000
Subject: 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
---
 django/forms/util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'django/forms/util.py')

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''
-- 
cgit v1.3