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/bugmail.html.tmpl  | 3 ++-
 template/en/default/email/flagmail.html.tmpl | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index 37252977a..c3b8b357f 100644
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -27,7 +27,8 @@
               on [% "$terms.bug $bug.id" FILTER bug_link(bug, { full_url => 1, user => to_user }) FILTER none %]
               from [% INCLUDE global/user.html.tmpl user = to_user, who = comment.author %]</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>
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