summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-02-04 02:33:38 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-02-04 02:33:38 +0000
commit12ed18935b3119ea2ffa560cff59040eeb659c82 (patch)
treedae2f887f8b502fa0a72822fd347aa29212f8a70 /django
parent10015fae4de33dd5dfd38a3a14a9ddd4cb8442bf (diff)
Fixed #6113 -- Added auto-escaping "safe" marking for the MultiWidget. Thanks, Martin Conte MacDonell.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7083 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/newforms/widgets.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/newforms/widgets.py b/django/newforms/widgets.py
index 580834857e..20a7cab469 100644
--- a/django/newforms/widgets.py
+++ b/django/newforms/widgets.py
@@ -426,7 +426,7 @@ class MultiWidget(Widget):
if id_:
final_attrs = dict(final_attrs, id='%s_%s' % (id_, i))
output.append(widget.render(name + '_%s' % i, widget_value, final_attrs))
- return self.format_output(output)
+ return mark_safe(self.format_output(output))
def id_for_label(self, id_):
# See the comment for RadioSelect.id_for_label()