From 30a152a367541a0b815ab84b3da407700feff744 Mon Sep 17 00:00:00 2001
From: Adam Taylor <ataylor32@gmail.com>
Date: Thu, 2 Jul 2015 10:45:11 -0600
Subject: [PATCH] Fixed #25053 -- Made admin templates use |safe with password
 help_text

---
 .../admin/templates/admin/auth/user/change_password.html      | 4 ++--
 .../admin/templates/registration/password_change_form.html    | 4 ++--
 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>