Author: jezdez
Date: 2012-02-09 10:57:47 -0800 (Thu, 09 Feb 2012)
New Revision: 17475
Modified:
django/trunk/django/contrib/admin/options.py
Log:
Fixed #17239 -- Stopped an inconsitent and unneeded use of mark_safe in the
ModelAdmin. Thanks, pbnan.
Modified: django/trunk/django/contrib/admin/options.py
===================================================================
--- django/trunk/django/contrib/admin/options.py 2012-02-09 18:57:40 UTC
(rev 17474)
+++ django/trunk/django/contrib/admin/options.py 2012-02-09 18:57:47 UTC
(rev 17475)
@@ -1001,7 +1001,7 @@
'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 @@
'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,
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
