summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Ting <altlist@gmail.com>2015-04-13 16:15:29 +0200
committerDavid Lawrence <dkl@mozilla.com>2015-04-13 16:15:29 +0200
commit464dad0e3d986addd65235d768554a9753a2c849 (patch)
treecfd4268a2d98750cb5a04aa4367ef15f387a136c
parentd6c2d37b69eb19b0f0136112d1da45dadb42cbb4 (diff)
downloadbugzilla-464dad0e3d986addd65235d768554a9753a2c849.tar.gz
bugzilla-464dad0e3d986addd65235d768554a9753a2c849.tar.xz
Bug 1150667: Don't wrap email comments when in markdown mode
r=dkl,a=glob
-rw-r--r--template/en/default/email/bugmail.html.tmpl7
-rw-r--r--template/en/default/email/flagmail.html.tmpl3
2 files changed, 7 insertions, 3 deletions
diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index 1a74db4dc..e3b63f10b 100644
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -28,8 +28,11 @@
full_url = 1, user = to_user %]
from [% INCLUDE global/user.html.tmpl user = to_user, who = comment.author %]</b>
[% END %]
- [% 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 %]>
+ [% comment_div = comment.is_markdown ? "div" : "pre" %]
+ [% wrap = comment.is_markdown ? 0 : 1 %]
+ <[% comment_div FILTER none %] class="bz_comment_text">
+ [% comment.body_full({ wrap => wrap }) 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 1c8fc0731..152c3420e 100644
--- a/template/en/default/email/flagmail.html.tmpl
+++ b/template/en/default/email/flagmail.html.tmpl
@@ -73,7 +73,8 @@
<b>Description:</b>
[% END %]
[% 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 %]>
+ [% wrap = comment.is_markdown ? 0 : 1 %]
+ <[% comment_div FILTER none %] class="bz_comment_text">[% comment.body_full({ wrap => wrap }) FILTER markdown(bug, comment, to_user) %]</[% comment_div FILTER none %]>
</div>
[% END %]
</p>