From 46f1369d92c1ac4e37e9b1efffc7c87d759508eb Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Thu, 9 Feb 2012 18:57:47 +0000 Subject: [PATCH] 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/contrib/admin/options.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 21eced0fb0..f5f6256f93 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -1001,7 +1001,7 @@ class ModelAdmin(BaseModelAdmin): '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 @@ class ModelAdmin(BaseModelAdmin): '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,