Skip to content

bugzilla
bugzilla
Commit 2c82105b authored by Albert Ting's avatar Albert Ting Committed by Byron Jones
Browse files
Options

Bug 1142365: Don't use <pre> for markdown comments in email

r=glob,a=glob
parent 7559020b
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
template/en/default/email/bugmail.html.tmpl
View file @ 2c82105b
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
on [% "$terms.bug $bug.id" FILTER bug_link(bug, { full_url => 1, user => to_user }) FILTER none %] 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> from [% INCLUDE global/user.html.tmpl user = to_user, who = comment.author %]</b>
[% END %] [% 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> </div>
[% END %] [% END %]
</p> </p>
......
template/en/default/email/flagmail.html.tmpl
View file @ 2c82105b
...@@ -72,7 +72,8 @@ ...@@ -72,7 +72,8 @@
[% ELSE %] [% ELSE %]
<b>Description:</b> <b>Description:</b>
[% END %] [% 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> </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