From bb6921ce888cfc981c4df8d5f079b0b7a4121ff6 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Sat, 4 Feb 2012 12:48:21 +0000 Subject: Fixed #17596 -- Stopped the AdminField class from double quoting its label. Thanks, guettli and claudep. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17431 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/helpers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'django') diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py index 04a3492e1c..b7c65e175f 100644 --- a/django/contrib/admin/helpers.py +++ b/django/contrib/admin/helpers.py @@ -115,17 +115,17 @@ class AdminField(object): def label_tag(self): classes = [] + contents = conditional_escape(force_unicode(self.field.label)) if self.is_checkbox: classes.append(u'vCheckboxLabel') - contents = force_unicode(escape(self.field.label)) else: - contents = force_unicode(escape(self.field.label)) + u':' + contents += u':' if self.field.field.required: classes.append(u'required') if not self.is_first: classes.append(u'inline') attrs = classes and {'class': u' '.join(classes)} or {} - return self.field.label_tag(contents=contents, attrs=attrs) + return self.field.label_tag(contents=mark_safe(contents), attrs=attrs) def errors(self): return mark_safe(self.field.errors.as_ul()) -- cgit v1.3