Commit 46f1369d authored by Jannis Leidel's avatar Jannis Leidel
Browse files

Fixed #17239 -- Stopped an inconsitent and unneeded use of mark_safe in the... 

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
parent bc8875e3

django/contrib/admin/options.py

+2 −2
Original line number Diff line number Diff line
@@ -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,