Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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 authored February 09, 2012

Showing 1 changed file with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. 4  django/contrib/admin/options.py
4  django/contrib/admin/options.py
@@ -1001,7 +1001,7 @@ def add_view(self, request, form_url='', extra_context=None):
1001 1001
             'adminform': adminForm,
1002 1002
             'is_popup': "_popup" in request.REQUEST,
1003 1003
             'show_delete': False,
1004  
-            'media': mark_safe(media),
  1004
+            'media': media,
1005 1005
             'inline_admin_formsets': inline_admin_formsets,
1006 1006
             'errors': helpers.AdminErrorList(form, formsets),
1007 1007
             'app_label': opts.app_label,
@@ -1093,7 +1093,7 @@ def change_view(self, request, object_id, form_url='', extra_context=None):
1093 1093
             'object_id': object_id,
1094 1094
             'original': obj,
1095 1095
             'is_popup': "_popup" in request.REQUEST,
1096  
-            'media': mark_safe(media),
  1096
+            'media': media,
1097 1097
             'inline_admin_formsets': inline_admin_formsets,
1098 1098
             'errors': helpers.AdminErrorList(form, formsets),
1099 1099
             'app_label': opts.app_label,

0 notes on commit 46f1369

Please sign in to comment.
Something went wrong with that request. Please try again.