From: Albert Ting <altlist@gmail.com>
Date: Tue, 24 Mar 2015 13:36:33 +0000 (+0800)
Subject: Bug 1142365: Don't use <pre> for markdown comments in email
X-Git-Tag: release-5.1.1~317
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c82105b0fed5d6739111c5de8dba063b01ab446;p=thirdparty%2Fbugzilla.git

Bug 1142365: Don't use <pre> for markdown comments in email
r=glob,a=glob
---

diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index 37252977a2..c3b8b357f3 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 314455c658..d0b61fbbc2 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>