summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Taylor <ataylor32@gmail.com>2015-07-02 10:45:11 -0600
committerTim Graham <timograham@gmail.com>2015-07-02 14:02:18 -0400
commit30a152a367541a0b815ab84b3da407700feff744 (patch)
treef2e669ab54512ecb83ffdfe2d5b18bd4cbd95816
parent9a5cfa05a0d889db9daa7872a9697daa883f3609 (diff)
downloaddjango-30a152a367541a0b815ab84b3da407700feff744.tar.gz
Fixed #25053 -- Made admin templates use |safe with password help_text
-rw-r--r--django/contrib/admin/templates/admin/auth/user/change_password.html4
-rw-r--r--django/contrib/admin/templates/registration/password_change_form.html4
2 files changed, 4 insertions, 4 deletions
diff --git a/django/contrib/admin/templates/admin/auth/user/change_password.html b/django/contrib/admin/templates/admin/auth/user/change_password.html
index bfffd2a77b..c788571fb6 100644
--- a/django/contrib/admin/templates/admin/auth/user/change_password.html
+++ b/django/contrib/admin/templates/admin/auth/user/change_password.html
@@ -36,7 +36,7 @@
{{ form.password1.errors }}
{{ form.password1.label_tag }} {{ form.password1 }}
{% if form.password1.help_text %}
- <p class="help">{{ form.password1.help_text }}</p>
+ <p class="help">{{ form.password1.help_text|safe }}</p>
{% endif %}
</div>
@@ -44,7 +44,7 @@
{{ form.password2.errors }}
{{ form.password2.label_tag }} {{ form.password2 }}
{% if form.password2.help_text %}
- <p class="help">{{ form.password2.help_text }}</p>
+ <p class="help">{{ form.password2.help_text|safe }}</p>
{% endif %}
</div>
diff --git a/django/contrib/admin/templates/registration/password_change_form.html b/django/contrib/admin/templates/registration/password_change_form.html
index 1e641dcc09..a0b8375af7 100644
--- a/django/contrib/admin/templates/registration/password_change_form.html
+++ b/django/contrib/admin/templates/registration/password_change_form.html
@@ -36,7 +36,7 @@
{{ form.new_password1.errors }}
{{ form.new_password1.label_tag }} {{ form.new_password1 }}
{% if form.new_password1.help_text %}
- <p class="help">{{ form.new_password1.help_text }}</p>
+ <p class="help">{{ form.new_password1.help_text|safe }}</p>
{% endif %}
</div>
@@ -44,7 +44,7 @@
{{ form.new_password2.errors }}
{{ form.new_password2.label_tag }} {{ form.new_password2 }}
{% if form.new_password2.help_text %}
- <p class="help">{{ form.new_password2.help_text }}</p>
+ <p class="help">{{ form.new_password2.help_text|safe }}</p>
{% endif %}
</div>