Skip to content

bugzilla
bugzilla
Commit 464dad0e authored by Albert Ting's avatar Albert Ting Committed by David Lawrence
Browse files
Options

Bug 1150667: Don't wrap email comments when in markdown mode

r=dkl,a=glob
parent d6c2d37b
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
template/en/default/email/bugmail.html.tmpl
View file @ 464dad0e
...@@ -28,8 +28,11 @@ ...@@ -28,8 +28,11 @@
full_url = 1, user = to_user %] full_url = 1, user = to_user %]
from [% INCLUDE global/user.html.tmpl user = to_user, who = comment.author %]</b> from [% INCLUDE global/user.html.tmpl user = to_user, who = comment.author %]</b>
[% END %] [% END %]
[% comment_div = comment.is_markdown ? "div" : "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 %]> [% 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> </div>
[% END %] [% END %]
</p> </p>
......
template/en/default/email/flagmail.html.tmpl
View file @ 464dad0e
...@@ -73,7 +73,8 @@ ...@@ -73,7 +73,8 @@
<b>Description:</b> <b>Description:</b>
[% END %] [% END %]
[% comment_div = comment.is_markdown ? "div" : "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 %]> [% 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> </div>
[% END %] [% END %]
</p> </p>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment