diff options
| -rw-r--r-- | Bugzilla/BugMail.pm | 4 | ||||
| -rw-r--r-- | template/en/default/email/newchangedmail.txt.tmpl | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm index 9a1b2a8a2..ec4bf30da 100644 --- a/Bugzilla/BugMail.pm +++ b/Bugzilla/BugMail.pm @@ -352,7 +352,7 @@ sub Send { if ($deptext) { my $diffpart = {}; - $diffpart->{'text'} = "\n" . trim("\n\n" . $deptext); + $diffpart->{'text'} = "\n" . trim($deptext); push(@diffparts, $diffpart); } } @@ -595,6 +595,8 @@ sub sendMail { } my $diffs = $difftext; + # Remove extra newlines. + $diffs =~ s/^\n+//s; $diffs =~ s/\n+$//s; if ($isnew) { my $head = ""; foreach my $f (@headerlist) { diff --git a/template/en/default/email/newchangedmail.txt.tmpl b/template/en/default/email/newchangedmail.txt.tmpl index 494c12060..b90c15b1d 100644 --- a/template/en/default/email/newchangedmail.txt.tmpl +++ b/template/en/default/email/newchangedmail.txt.tmpl @@ -41,8 +41,10 @@ X-Bugzilla-Changed-Fields: [% changedfields %] [%+ threadingmarker %] [%+ urlbase %]show_bug.cgi?id=[% bugid %] +[%- IF diffs %] [%+ diffs %] +[% END -%] [% FOREACH comment = new_comments %] --- Comment #[% comment.count %] from [% comment.author.identity %] [%+ comment.time FILTER time %] --- |