From 07619982279cc14fea78ae7e4567703aec11577a Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Thu, 26 Jul 2018 14:33:40 +0200
Subject: [PATCH] templates: mark help_text as safe in registration form (fixes
 #25494)

---
 .../registration_completion_form.html         | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/templates/registration/registration_completion_form.html b/templates/registration/registration_completion_form.html
index b7fe90b..c6bef90 100644
--- a/templates/registration/registration_completion_form.html
+++ b/templates/registration/registration_completion_form.html
@@ -16,10 +16,10 @@
     <p>Votre courriel <strong>{{ email }}</strong> a été validé.<br />
       Veuillez renseigner les informations suivantes.</p>
     <div>
-      <div>{{ form.first_name.errors }}{{ form.first_name.label_tag }} {{ form.first_name }} <span class="help_text">{{ form.first_name.help_text }}</span></div>
-      <div>{{ form.last_name.errors }}{{ form.last_name.label_tag }} {{ form.last_name }} <span class="help_text">{{ form.last_name.help_text }}</span></div>
-      <div>{{ form.password1.errors }}{{ form.password1.label_tag }}{{ form.password1 }} <span class="help_text">{{ form.password1.help_text }}</span></div>
-      <div>{{ form.password2.errors }}{{ form.password2.label_tag }} {{ form.password2 }} <span class="help_text">{{ form.password2.help_text }}</span></div>
+      <div>{{ form.first_name.errors }}{{ form.first_name.label_tag }} {{ form.first_name }} <span class="help_text">{{ form.first_name.help_text|safe }}</span></div>
+      <div>{{ form.last_name.errors }}{{ form.last_name.label_tag }} {{ form.last_name }} <span class="help_text">{{ form.last_name.help_text|safe }}</span></div>
+      <div>{{ form.password1.errors }}{{ form.password1.label_tag }}{{ form.password1 }} <span class="help_text">{{ form.password1.help_text|safe }}</span></div>
+      <div>{{ form.password2.errors }}{{ form.password2.label_tag }} {{ form.password2 }} <span class="help_text">{{ form.password2.help_text|safe }}</span></div>
     </div>
     <p class="center"><input type="submit" value="Valider" /></p>
     <!-- scroll down animation -->
@@ -45,29 +45,29 @@
 
     <h3 class="section">Données d’Identité</h3>
     <div>
-      <div>{{ form.title.errors }}{{ form.title.label_tag }} {{ form.title }} <span class="help_text">{{ form.title.help_text }}</span></div>
-      <div>{{ form.preferred_givenname.errors }}{{ form.preferred_givenname.label_tag }} {{ form.preferred_givenname }} <span class="help_text">{{ form.preferred_givenname.help_text }}</span></div>
-      <div>{{ form.preferred_username.errors }}{{ form.preferred_username.label_tag }} {{ form.preferred_username }} <span class="help_text">{{ form.preferred_username.help_text }}</span></div>
-      <div>{{ form.birthdate.errors }}{{ form.birthdate.label_tag }} {{ form.birthdate }} <span class="help_text">{{ form.birthdate.help_text }}</span></div>
-      <div>{{ form.birthplace.errors }}{{ form.birthplace.label_tag }} {{ form.birthplace }} <span class="help_text">{{ form.birthplace.help_text }}</span></div>
-      <div>{{ form.birthdepartment.errors }}{{ form.birthdepartment.label_tag }} {{ form.birthdepartment }} <span class="help_text">{{ form.birthdepartment.help_text }}</span></div>
-      <div>{{ form.birthcountry.errors }}{{ form.birthcountry.label_tag }} {{ form.birthcountry }} <span class="help_text">{{ form.birthcountry.help_text }}</span></div>
+      <div>{{ form.title.errors }}{{ form.title.label_tag }} {{ form.title }} <span class="help_text">{{ form.title.help_text|safe }}</span></div>
+      <div>{{ form.preferred_givenname.errors }}{{ form.preferred_givenname.label_tag }} {{ form.preferred_givenname }} <span class="help_text">{{ form.preferred_givenname.help_text|safe }}</span></div>
+      <div>{{ form.preferred_username.errors }}{{ form.preferred_username.label_tag }} {{ form.preferred_username }} <span class="help_text">{{ form.preferred_username.help_text|safe }}</span></div>
+      <div>{{ form.birthdate.errors }}{{ form.birthdate.label_tag }} {{ form.birthdate }} <span class="help_text">{{ form.birthdate.help_text|safe }}</span></div>
+      <div>{{ form.birthplace.errors }}{{ form.birthplace.label_tag }} {{ form.birthplace }} <span class="help_text">{{ form.birthplace.help_text|safe }}</span></div>
+      <div>{{ form.birthdepartment.errors }}{{ form.birthdepartment.label_tag }} {{ form.birthdepartment }} <span class="help_text">{{ form.birthdepartment.help_text|safe }}</span></div>
+      <div>{{ form.birthcountry.errors }}{{ form.birthcountry.label_tag }} {{ form.birthcountry }} <span class="help_text">{{ form.birthcountry.help_text|safe }}</span></div>
     </div>
     <h3 class="section">Adresse</h3>
     <div>
-      <div>{{ form.address_number.errors }}{{ form.address_number.label_tag }} {{ form.address_number }} <span class="help_text">{{ form.address_number.help_text }}</span></div>
-      <div>{{ form.address_street.errors }}{{ form.address_street.label_tag }} {{ form.address_street }} <span class="help_text">{{ form.address_street.help_text }}</span></div>
-      <div>{{ form.address_complement.errors }}{{ form.address_complement.label_tag }} {{ form.address_complement }} <span class="help_text">{{ form.address_complement.help_text }}</span></div>
-      <div>{{ form.address_zipcode.errors }}{{ form.address_zipcode.label_tag }} {{ form.address_zipcode }} <span class="help_text">{{ form.address_zipcode.help_text }}</span></div>
-      <div>{{ form.address_city.errors }}{{ form.address_city.label_tag }} {{ form.address_city }} <span class="help_text">{{ form.address_city.help_text }}</span></div>
-      <div>{{ form.address_country.errors }}{{ form.address_country.label_tag }} {{ form.address_country }} <span class="help_text">{{ form.address_country.help_text }}</span></div>
+      <div>{{ form.address_number.errors }}{{ form.address_number.label_tag }} {{ form.address_number }} <span class="help_text">{{ form.address_number.help_text|safe }}</span></div>
+      <div>{{ form.address_street.errors }}{{ form.address_street.label_tag }} {{ form.address_street }} <span class="help_text">{{ form.address_street.help_text|safe }}</span></div>
+      <div>{{ form.address_complement.errors }}{{ form.address_complement.label_tag }} {{ form.address_complement }} <span class="help_text">{{ form.address_complement.help_text|safe }}</span></div>
+      <div>{{ form.address_zipcode.errors }}{{ form.address_zipcode.label_tag }} {{ form.address_zipcode }} <span class="help_text">{{ form.address_zipcode.help_text|safe }}</span></div>
+      <div>{{ form.address_city.errors }}{{ form.address_city.label_tag }} {{ form.address_city }} <span class="help_text">{{ form.address_city.help_text|safe }}</span></div>
+      <div>{{ form.address_country.errors }}{{ form.address_country.label_tag }} {{ form.address_country }} <span class="help_text">{{ form.address_country.help_text|safe }}</span></div>
     </div>
     <h3 class="section">Coordonnées</h3>
     <div>
-      <div>{{ form.home_mobile_phone.errors }}{{ form.home_mobile_phone.label_tag }} {{ form.home_mobile_phone }} <span class="help_text">{{ form.home_mobile_phone.help_text }}</span></div>
-      <div>{{ form.home_phone.errors }}{{ form.home_phone.label_tag }} {{ form.home_phone }} <span class="help_text">{{ form.home_phone.help_text }}</span></div>
-      <div>{{ form.professional_mobile_phone.errors }}{{ form.professional_mobile_phone.label_tag }} {{ form.professional_mobile_phone }}<span class="help_text">{{ form.professional_mobile_phone.help_text }}</span></div>
-      <div>{{ form.professional_phone.errors }}{{ form.professional_phone.label_tag }} {{ form.professional_phone }} <span class="help_text">{{ form.professional_phone.help_text }}</span></div>
+      <div>{{ form.home_mobile_phone.errors }}{{ form.home_mobile_phone.label_tag }} {{ form.home_mobile_phone }} <span class="help_text">{{ form.home_mobile_phone.help_text|safe }}</span></div>
+      <div>{{ form.home_phone.errors }}{{ form.home_phone.label_tag }} {{ form.home_phone }} <span class="help_text">{{ form.home_phone.help_text|safe }}</span></div>
+      <div>{{ form.professional_mobile_phone.errors }}{{ form.professional_mobile_phone.label_tag }} {{ form.professional_mobile_phone }}<span class="help_text">{{ form.professional_mobile_phone.help_text|safe }}</span></div>
+      <div>{{ form.professional_phone.errors }}{{ form.professional_phone.label_tag }} {{ form.professional_phone }} <span class="help_text">{{ form.professional_phone.help_text|safe }}</span></div>
     </div>
     <p class="center"><input type="submit" value="Enregistrer mes données" /></p>
   </form>