Bug 524891: Make leading whitespace not be trimmed from comments on display.

Patch by Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=mkanat

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 456f77c9f25a78b8780baf1084347a9e21e7b409..14fe20c02451552b65b58df03dceec61898c644f 100644 (file)
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -3096,6 +3096,7 @@ sub format_comment {
 
     $template->process("bug/format_comment.txt.tmpl", $vars, \$body)
         || ThrowTemplateError($template->error());
+    $body =~ s/^X//;
     return $body;
 }
 

diff --git a/template/en/default/bug/format_comment.txt.tmpl b/template/en/default/bug/format_comment.txt.tmpl
index e399d8218cc6ee44c7a5179803c4b2ec33afd9c5..e0881e4e711057325ac0b81b93529a722d578b96 100644 (file)
--- a/template/en/default/bug/format_comment.txt.tmpl
+++ b/template/en/default/bug/format_comment.txt.tmpl
@@ -17,6 +17,11 @@
   # Contributor(s): Marc Schumann <wurblzap@gmail.com>
   #%]
 
+[%# NOTE: Everywhere you use this template, you must call 
+  # "FILTER remove('^X')" on the result. This is unfortunately the only way
+  # to preserve leading whitespace in comments.
+  #%]
+
 [%# INTERFACE:
   #   comment: A hash containing comment information.
   #              count:           The comment number (on the bug it belongs to)
@@ -33,14 +38,8 @@
 
 [% PROCESS 'global/field-descs.none.tmpl' %]
 
-[% IF comment.already_wrapped %]
-  [% wrapped_comment = comment.body %]
-[% ELSE %]
-  [% wrapped_comment = comment.body FILTER wrap_comment %]
-[% END %]
-
-[%- IF comment.type == constants.CMT_DUPE_OF -%]
-[% wrapped_comment %]
+[% IF comment.type == constants.CMT_DUPE_OF %]
+X[% comment.body %]
 
 *** This [% terms.bug %] has been marked as a duplicate of [% terms.bug %] [%+ comment.extra_data %] ***
 [% ELSIF comment.type == constants.CMT_HAS_DUPE %]
@@ -48,7 +47,7 @@
 [% ELSIF comment.type == constants.CMT_POPULAR_VOTES %]
 *** This [% terms.bug %] has been confirmed by popular vote. ***
 [% ELSIF comment.type == constants.CMT_MOVED_TO %]
-[% wrapped_comment %]
+X[% comment.body %]
 
 [%+ terms.Bug %] moved to [% Param("move-to-url") %].
 If the move succeeded, [% comment.extra_data %] will receive a mail containing
@@ -56,6 +55,6 @@ the number of the new [% terms.bug %] in the other database.
 If all went well, please mark this [% terms.bug %]
 [%+ display_value("bug_status", 'VERIFIED') %], and paste in a link to the new [% terms.bug %].
 Otherwise, reopen this [% terms.bug %].
-[%- ELSE -%]
-[%- wrapped_comment %]
+[% ELSE %]
+X[% comment.body %]
 [% END %]

diff --git a/template/en/default/email/newchangedmail.txt.tmpl b/template/en/default/email/newchangedmail.txt.tmpl
index ab614c1da20cd555ae5d8d1aaf2665867f3d6e23..9b1443bc2fbb89e760e4cc075b5ad622551731ac 100644 (file)
--- a/template/en/default/email/newchangedmail.txt.tmpl
+++ b/template/en/default/email/newchangedmail.txt.tmpl
@@ -50,7 +50,7 @@ X-Bugzilla-Changed-Fields: [% changedfields %]
 [%- IF comment.count %]
 --- Comment #[% comment.count %] from [% comment.author.identity %] [%+ comment.time FILTER time %] ---
 [% END %]
-[%+ PROCESS bug/format_comment.txt.tmpl comment = comment %]
+[%+ FILTER remove('^X') %][% PROCESS bug/format_comment.txt.tmpl %][% END %]
 [% END %]
 
 -- [%# Protect the trailing space of the signature marker %]