diff options
| author | Joseph Kocherhans <joseph@jkocherhans.com> | 2007-11-30 17:53:34 +0000 |
|---|---|---|
| committer | Joseph Kocherhans <joseph@jkocherhans.com> | 2007-11-30 17:53:34 +0000 |
| commit | 17dbd788b3c94ee286eba9318d4071fa386c78a6 (patch) | |
| tree | 9c79fe1748d90528f2da2573d9eba55faf0b87bd | |
| parent | c81b01e060ad80a5c4df579a96ff737df2d336b3 (diff) | |
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
| -rw-r--r-- | django/contrib/admin/options.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index dca8c1eef0..952d4b8298 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -522,7 +522,7 @@ class ModelAdmin(BaseModelAdmin): '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 @@ class ModelAdmin(BaseModelAdmin): '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) |