Fix mailing preview; fixes #1800

diff --git a/galette/lib/Galette/Core/Mailing.php b/galette/lib/Galette/Core/Mailing.php
index aa80ba1d4df2c783ae03f75e8c5992cde67fa58b..5e8fedde8feb8f8fe5a1e7488fab04fcfdd5d4c6 100644 (file)
--- a/galette/lib/Galette/Core/Mailing.php
+++ b/galette/lib/Galette/Core/Mailing.php
@@ -196,6 +196,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 6791a1030bbab5e4433be105214c097c74d2712c..c6b88028fea2a1f110e6f468cb39155d30f867ef 100644 (file)
--- a/galette/templates/default/modals/mailing_preview.html.twig
+++ b/galette/templates/default/modals/mailing_preview.html.twig
@@ -73,7 +73,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 %}