From 464dad0e3d986addd65235d768554a9753a2c849 Mon Sep 17 00:00:00 2001 From: Albert Ting Date: Mon, 13 Apr 2015 15:15:29 +0100 Subject: Bug 1150667: Don't wrap email comments when in markdown mode r=dkl,a=glob --- template/en/default/email/bugmail.html.tmpl | 7 +++++-- template/en/default/email/flagmail.html.tmpl | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'template/en/default/email') 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 %] [% 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 = 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) %] + [% END %]

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 @@ Description: [% 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) %] + [% 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) %] [% END %]

-- cgit v1.2.3-24-g4f1b