summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-08-08 21:19:59 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-08-08 21:19:59 +0000
commit660b9095577f53eab27bbfeec7c452bc0047a278 (patch)
treec3fa40e92380f01d41c0fd005753a0f704473641
parent7899568e01fc9c68afe995fa71de915dd9fcdd76 (diff)
Fixed #8107 -- Fixed a missing forced_unicode() call in admin. Patch from
bjronkri. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8245 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admin/options.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 6d7ef6f510..364a1b9852 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -104,7 +104,7 @@ class AdminField(object):
classes = []
if self.is_checkbox:
classes.append(u'vCheckboxLabel')
- contents = escape(self.field.label)
+ contents = force_unicode(escape(self.field.label))
else:
contents = force_unicode(escape(self.field.label)) + u':'
if self.field.field.required: