summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Bug.pm1
-rw-r--r--template/en/default/bug/format_comment.txt.tmpl21
-rw-r--r--template/en/default/email/newchangedmail.txt.tmpl2
3 files changed, 12 insertions, 12 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 456f77c9f..14fe20c02 100644
--- 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 e399d8218..e0881e4e7 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 <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 ab614c1da..9b1443bc2 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 %]