Fix mailing preview; fixes #1800

diff --git a/galette/lib/Galette/Core/Mailing.php b/galette/lib/Galette/Core/Mailing.php
index d3b2802fc9d80c6af4dfe9128956e9b12af81e0c..e2344014d58341e623a48eff892a3558d1337966 100644 (file)
--- a/galette/lib/Galette/Core/Mailing.php
+++ b/galette/lib/Galette/Core/Mailing.php
@@ -211,6 +211,7 @@ class Mailing extends GaletteMail
         $this->setRecipients($_recipients);
         $this->subject = $rs->mailing_subject;
         $this->message = $rs->mailing_body;
+        $this->html = $this->message != strip_tags($this->message) ? true : false;
         if ($rs->mailing_sender_name !== null || $rs->mailing_sender_address !== null) {
             $this->setSender(
                 $rs->mailing_sender_name,

diff --git a/galette/templates/default/modals/mailing_preview.html.twig b/galette/templates/default/modals/mailing_preview.html.twig
index 88292c7ddd680b7d7da809ea0c8853254fe2ced1..9c0632f89ba2902432e1bdfd1c44cd4fb7f2cfa9 100644 (file)
--- a/galette/templates/default/modals/mailing_preview.html.twig
+++ b/galette/templates/default/modals/mailing_preview.html.twig
@@ -53,7 +53,7 @@
         </div>
         <div class="ui bottom attached accordion-styled segment">
     {% if mailing.html %}
-            {{ mailing.message }}
+            {{ mailing.message|raw }}
     {% else %}
             <pre>{{ mailing.wrapped_message|escape }}</pre>
     {% endif %}