Fixed #17239 -- Stopped an inconsitent and unneeded use of mark_safe …

…in the ModelAdmin. Thanks, pbnan. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17475 bcc190cf-cafb-0310-a4f2-bffc1f526a37
django · Feb 9, 2012 · 46f1369 · 46f1369
1 parent bc8875e
commit 46f1369
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
@@ -1001,7 +1001,7 @@ def add_view(self, request, form_url='', extra_context=None):
             'adminform': adminForm,
             'is_popup': "_popup" in request.REQUEST,
             'show_delete': False,
-            'media': mark_safe(media),
+            'media': media,
             'inline_admin_formsets': inline_admin_formsets,
             'errors': helpers.AdminErrorList(form, formsets),
             'app_label': opts.app_label,
@@ -1093,7 +1093,7 @@ def change_view(self, request, object_id, form_url='', extra_context=None):
             'object_id': object_id,
             'original': obj,
             'is_popup': "_popup" in request.REQUEST,
-            'media': mark_safe(media),
+            'media': media,
             'inline_admin_formsets': inline_admin_formsets,
             'errors': helpers.AdminErrorList(form, formsets),
             'app_label': opts.app_label,