Merge branch 'b-3.6.1' into mebil

[kivitendo-erp.git] / templates / webpages / email_journal / show.html

diff --git a/templates/webpages/email_journal/show.html b/templates/webpages/email_journal/show.html
index 20444a9..b484bc7 100644 (file)
--- a/templates/webpages/email_journal/show.html
+++ b/templates/webpages/email_journal/show.html
@@ -1,4 +1,4 @@
-[% USE HTML %][% USE L %][% USE LxERP %]
+[% USE HTML %][% USE L %][% USE LxERP %][%- USE P -%]
 
  <h1>[% FORM.title %]</h1>
 
@@ -49,7 +49,13 @@
 
    <tr class="listrow">
     <th>[%- LxERP.t8("Body") %]</th>
-    <td><pre>[% HTML.escape(SELF.entry.body) %]</pre></td>
+    <td>
+     [%- IF SELF.entry.headers.match('(?i)content-type:.*text/html') %]
+      [% P.restricted_html(SELF.entry.body) %]
+     [%- ELSE %]
+      <pre>[% HTML.escape(SELF.entry.body) %]</pre>
+     [%- END %]
+    </td>
    </tr>
  </table>