Bug 1520221 - Avoid wrapping markdown comments

diff --git a/extensions/BMO/template/en/default/email/bugmail.html.tmpl b/extensions/BMO/template/en/default/email/bugmail.html.tmpl
index d6c2ede85edd25ff7b7ffac19de18559935ff727..bf6db2d7b5551dfc77608a3063c102f815e6ff61 100644 (file)
--- a/extensions/BMO/template/en/default/email/bugmail.html.tmpl
+++ b/extensions/BMO/template/en/default/email/bugmail.html.tmpl
@@ -48,11 +48,13 @@
             </b>
           [% END %]
           [% IF comment.is_markdown AND Param('use_markdown') %]
+            [% should_wrap = 0 %]
             [% comment_tag = 'div' %]
           [% ELSE %]
+            [% should_wrap = 1 %]
             [% comment_tag = 'pre' %]
           [% END %]
-          <[% comment_tag FILTER none %] class="comment" [% IF comment_tag == 'pre' %] style="font-size: initial" [% END %]>[% comment.body_full({ wrap => 1 }) FILTER renderMarkdown(bug, comment) %]</[% comment_tag FILTER none %]>
+          <[% comment_tag FILTER none %] class="comment" [% IF comment_tag == 'pre' %] style="font-size: initial" [% END %]>[% comment.body_full({ wrap => should_wrap }) FILTER renderMarkdown(bug, comment) %]</[% comment_tag FILTER none %]>
         </div>
       [% END %]
     </div>