summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authorAlbert Ting <altlist@gmail.com>2015-03-24 14:36:33 +0100
committerByron Jones <glob@mozilla.com>2015-03-24 14:36:33 +0100
commit2c82105b0fed5d6739111c5de8dba063b01ab446 (patch)
tree6411101fdebdcac22ed253b4fd74d353cc4ff48a /template/en/default
parent7559020b6e10103849bd7eb2302d7a60b5b0b0b8 (diff)
downloadbugzilla-2c82105b0fed5d6739111c5de8dba063b01ab446.tar.gz
bugzilla-2c82105b0fed5d6739111c5de8dba063b01ab446.tar.xz
Bug 1142365: Don't use <pre> for markdown comments in email
r=glob,a=glob
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/email/bugmail.html.tmpl3
-rw-r--r--template/en/default/email/flagmail.html.tmpl3
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>