mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-25 18:46:22 +00:00
Code Issues 25 Releases Wiki Activity

Fixed #17239 -- Stopped an inconsitent and unneeded use of mark_safe in the ModelAdmin. Thanks, pbnan.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17475 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2012-02-09 18:57:47 +00:00
parent bc8875e37c
commit 46f1369d92
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/admin/options.py
View File

@ -1001,7 +1001,7 @@ class ModelAdmin(BaseModelAdmin):
'adminform': adminForm, 'adminform': adminForm,
'is_popup': "_popup" in request.REQUEST, 'is_popup': "_popup" in request.REQUEST,
'show_delete': False, 'show_delete': False,
'media': mark_safe(media), 'media': media,
'inline_admin_formsets': inline_admin_formsets, 'inline_admin_formsets': inline_admin_formsets,
'errors': helpers.AdminErrorList(form, formsets), 'errors': helpers.AdminErrorList(form, formsets),
'app_label': opts.app_label, 'app_label': opts.app_label,
@ -1093,7 +1093,7 @@ class ModelAdmin(BaseModelAdmin):
'object_id': object_id, 'object_id': object_id,
'original': obj, 'original': obj,
'is_popup': "_popup" in request.REQUEST, 'is_popup': "_popup" in request.REQUEST,
'media': mark_safe(media), 'media': media,
'inline_admin_formsets': inline_admin_formsets, 'inline_admin_formsets': inline_admin_formsets,
'errors': helpers.AdminErrorList(form, formsets), 'errors': helpers.AdminErrorList(form, formsets),
'app_label': opts.app_label, 'app_label': opts.app_label,