From 17dbd788b3c94ee286eba9318d4071fa386c78a6 Mon Sep 17 00:00:00 2001 From: Joseph Kocherhans Date: Fri, 30 Nov 2007 17:53:34 +0000 Subject: [PATCH] newforms-admin: Fixed #6059. Javascript in the admin is no longer escaped. git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6779 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/options.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index dca8c1eef0a72..952d4b82985de 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -522,7 +522,7 @@ def add_view(self, request, form_url=''): 'adminform': adminForm, 'is_popup': request.REQUEST.has_key('_popup'), 'show_delete': False, - 'media': media, + 'media': mark_safe(media), 'inline_admin_formsets': inline_admin_formsets, }) return self.render_change_form(model, c, add=True) @@ -597,7 +597,7 @@ def change_view(self, request, object_id): 'object_id': object_id, 'original': obj, 'is_popup': request.REQUEST.has_key('_popup'), - 'media': media, + 'media': mark_safe(media), 'inline_admin_formsets': inline_admin_formsets, }) return self.render_change_form(model, c, change=True)