summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-07-06 15:41:06 -0400
committerTim Graham <timograham@gmail.com>2016-07-15 09:23:32 -0400
commitd03bf6fe4e9bf5b07de62c1a271c4b41a7d3d158 (patch)
treecaffc2e8db737972ec4d8d48961f506e43090336 /django
parentab2f5f764a2f6db97e23cccd5c4f5abbb43d1caf (diff)
[1.9.x] Fixed XSS in admin's add/change related popup.
This is a security fix.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js2
-rw-r--r--django/views/debug.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js b/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js
index 4ac9baa8ee..76cc952239 100644
--- a/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js
+++ b/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js
@@ -120,7 +120,7 @@
var selects = django.jQuery(selectsSelector);
selects.find('option').each(function() {
if (this.value === objId) {
- this.innerHTML = newRepr;
+ this.textContent = newRepr;
this.value = newId;
}
});
diff --git a/django/views/debug.py b/django/views/debug.py
index 7cff3eface..2629d345eb 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -631,13 +631,13 @@ TECHNICAL_500_TEMPLATE = ("""
var s = link.getElementsByTagName('span')[0];
var uarr = String.fromCharCode(0x25b6);
var darr = String.fromCharCode(0x25bc);
- s.innerHTML = s.innerHTML == uarr ? darr : uarr;
+ s.textContent = s.textContent == uarr ? darr : uarr;
return false;
}
function switchPastebinFriendly(link) {
s1 = "Switch to copy-and-paste view";
s2 = "Switch back to interactive view";
- link.innerHTML = link.innerHTML.trim() == s1 ? s2: s1;
+ link.textContent = link.textContent.trim() == s1 ? s2: s1;
toggle('browserTraceback', 'pastebinTraceback');
return false;
}