Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 73330: Remove extra newlines in bugmail

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


git-svn-id: svn://10.0.0.236/branches/BUGZILLA-3_4-BRANCH@258166 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkanat%bugzilla.org 2009-08-19 04:46:49 +00:00
parent 85157df80c
commit cc24cd132f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/webtools/bugzilla/Bugzilla/BugMail.pm
View File

@ -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) {

2
mozilla/webtools/bugzilla/template/en/default/email/newchangedmail.txt.tmpl
View File

@ -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 %] ---