summaryrefslogtreecommitdiff
path: root/django/forms/widgets.py
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2008-08-10 12:29:47 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2008-08-10 12:29:47 +0000
commit4ecc5f490a5c8a72dfab7b1fd00bdcfe782557ea (patch)
tree77068e66aaee01d4b4eadbfeba6a0c76c4df1395 /django/forms/widgets.py
parent2e0859140300e0f8944d593900d14cfb3552ac84 (diff)
Fixed #8041 -- Modified media rendering to return safe strings. Thanks to Daniel Pope <dan@mauveinternet.co.uk> for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8285 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/forms/widgets.py')
-rw-r--r--django/forms/widgets.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index cc065d71d8..4dd0601d69 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -50,7 +50,7 @@ class Media(StrAndUnicode):
return self.render()
def render(self):
- return u'\n'.join(chain(*[getattr(self, 'render_' + name)() for name in MEDIA_TYPES]))
+ return mark_safe(u'\n'.join(chain(*[getattr(self, 'render_' + name)() for name in MEDIA_TYPES])))
def render_js(self):
return [u'<script type="text/javascript" src="%s"></script>' % self.absolute_path(path) for path in self._js]