diff options
| author | Alexander Gaevsky <sasha@sasha0.ru> | 2016-01-07 11:07:15 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-01-08 11:06:56 -0500 |
| commit | a839d71d8562abe0b245024e55ca1d02a45e58fd (patch) | |
| tree | 3efcf34ce1d42479ec9202490af91e83a3601644 /django | |
| parent | f42ab40b733e9a9a00afd9f68de1f041cb96c7e6 (diff) | |
[1.9.x] Fixed #25997 -- Removed redundant escaping in admin's edit related model popup.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/options.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 2557de9cd2..dab27d5437 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -38,7 +38,7 @@ from django.template.response import SimpleTemplateResponse, TemplateResponse from django.utils import six from django.utils.decorators import method_decorator from django.utils.encoding import force_text, python_2_unicode_compatible -from django.utils.html import escape, escapejs +from django.utils.html import escape from django.utils.http import urlencode from django.utils.safestring import mark_safe from django.utils.text import capfirst, get_text_list @@ -1113,9 +1113,9 @@ class ModelAdmin(BaseModelAdmin): new_value = obj.serializable_value(attr) return SimpleTemplateResponse('admin/popup_response.html', { 'action': 'change', - 'value': escape(value), - 'obj': escapejs(obj), - 'new_value': escape(new_value), + 'value': value, + 'obj': obj, + 'new_value': new_value, }) opts = self.model._meta |
