Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
r=glob,a=glob


git-svn-id: svn://10.0.0.236/trunk@265893 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2015-03-24 13:45:50 +00:00
parent a95e4cef08
commit 5c17fd886b
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
9347
9348

2
mozilla/webtools/bugzilla/.gitrev
View File

@ -1 +1 @@
7559020b6e10103849bd7eb2302d7a60b5b0b0b8
2c82105b0fed5d6739111c5de8dba063b01ab446

3
mozilla/webtools/bugzilla/template/en/default/email/bugmail.html.tmpl
View File

@ -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>

3
mozilla/webtools/bugzilla/template/en/default/email/flagmail.html.tmpl
View File

@ -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>