Bug 509152: Line breaks erroneously present in comments for bugs in XML format -...

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 5bbbe723a8ec3cff9dc5564d421604601e675e03..9a8baca590cf99aa70303cd36aa1b50b427df1c3 100644 (file)
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -684,6 +684,7 @@ sub get_comments_by_bug {
         if ($comment->{body} =~ /Created an attachment \(/) {
             $comment->{body} =~ s/(Created an attachment \(id=([0-9]+)\))/$1\n --> \($attach_base$2\)/g;
         }
+        $comment->{body} = $comment->{'already_wrapped'} ? $comment->{body} : wrap_comment($comment->{body});
     }
 
     if (Bugzilla->params->{'insidergroup'}) {

diff --git a/template/en/default/bug/format_comment.txt.tmpl b/template/en/default/bug/format_comment.txt.tmpl
old mode 100755 (executable)
new mode 100644 (file)
index 6da39e6..87734a9
--- a/template/en/default/bug/format_comment.txt.tmpl
+++ b/template/en/default/bug/format_comment.txt.tmpl
@@ -33,14 +33,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 %]
+[% 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 +42,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 %]
+[% comment.body %]
 
 [%+ terms.Bug %] moved to [% Param("move-to-url") %].
 If the move succeeded, [% comment.extra_data %] will receive a mail containing
@@ -57,5 +51,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 -%]
-[%- wrapped_comment %]
+[%- comment.body %]
 [% END %]