From 2c82105b0fed5d6739111c5de8dba063b01ab446 Mon Sep 17 00:00:00 2001
From: Albert Ting <altlist@gmail.com>
Date: Tue, 24 Mar 2015 21:36:33 +0800
Subject: Bug 1142365: Don't use <pre> for markdown comments in email
 r=glob,a=glob

---
 template/en/default/email/flagmail.html.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'template/en/default/email/flagmail.html.tmpl')

diff --git a/template/en/default/email/flagmail.html.tmpl b/template/en/default/email/flagmail.html.tmpl
index 314455c65..d0b61fbbc 100644
--- a/template/en/default/email/flagmail.html.tmpl
+++ b/template/en/default/email/flagmail.html.tmpl
@@ -72,7 +72,8 @@
           [% ELSE %]
             <b>Description:</b>
           [% END %]
-          <pre>[% comment.body_full({ wrap => 1 }) FILTER markdown(bug, comment, to_user) %]</pre>
+          [% comment_div = comment.is_markdown ? "div" : "pre" %]
+          <[% comment_div FILTER none %] class="bz_comment_text">[% comment.body_full({ wrap => 1 }) FILTER markdown(bug, comment, to_user) %]</[% comment_div FILTER none %]>
         </div>
       [% END %]
     </p>
-- 
cgit v1.2.3-24-g4f1b