From: mkanat%bugzilla.org <> Date: Sun, 1 Nov 2009 20:14:11 +0000 (+0000) Subject: Bug 524891: Make leading whitespace not be trimmed from comments on display. X-Git-Tag: bugzilla-3.4.3~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67de33948508c0f9b832fc987fd6664c7762cbca;p=thirdparty%2Fbugzilla.git Bug 524891: Make leading whitespace not be trimmed from comments on display. Patch by Max Kanat-Alexander r=LpSolit, a=mkanat --- diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 19e93f42c8..8dfe9fbf8d 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -3095,6 +3095,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 87734a9ae0..d53ec44c51 100644 --- 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 #%] +[%# 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) @@ -34,7 +39,7 @@ [% PROCESS 'global/field-descs.none.tmpl' %] [%- IF comment.type == constants.CMT_DUPE_OF -%] -[% comment.body %] +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 %] @@ -42,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 %] -[% comment.body %] +X[% comment.body %] [%+ terms.Bug %] moved to [% Param("move-to-url") %]. If the move succeeded, [% comment.extra_data %] will receive a mail containing @@ -51,5 +56,5 @@ If all went well, please mark this [% terms.bug %] [%+ get_status('VERIFIED') %], and paste in a link to the new [% terms.bug %]. Otherwise, reopen this [% terms.bug %]. [%- ELSE -%] -[%- comment.body %] +X[%- comment.body %] [% END %] diff --git a/template/en/default/email/newchangedmail.txt.tmpl b/template/en/default/email/newchangedmail.txt.tmpl index ab614c1da2..9b1443bc2f 100644 --- 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 %]