Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 46f1369d92c1ac4e37e9b1efffc7c87d759508eb 1 parent bc8875e
Jannis Leidel jezdez authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 django/contrib/admin/options.py
4 django/contrib/admin/options.py
View
@@ -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,
Please sign in to comment.
Something went wrong with that request. Please try again.