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

Bug 509035: An empty e-mail gets sent to non-timetrackinggroup members if I change time tracking information - Patch by Frédéric Buclin <LpSolit@gmail.com> r=mkanat a=LpSolit

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@258336 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
lpsolit%gmail.com
2009-09-08 16:12:31 +00:00
parent f8136ab157
commit ce23102518
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -576,22 +576,11 @@ sub sendMail {
$difftext .= $diff->{'text'};
}
}
if ($difftext eq "" && $newcomments eq "" && !$isnew) {
if ($difftext eq "" && !scalar(@$newcomments) && !$isnew) {
# Whoops, no differences!
return 0;
}
# If an attachment was created, then add an URL. (Note: the 'g'lobal
# replace should work with comments with multiple attachments.)
if ( $newcomments =~ /Created an attachment \(/ ) {
my $showattachurlbase =
Bugzilla->params->{'urlbase'} . "attachment.cgi?id=";
$newcomments =~ s/(Created an attachment \(id=([0-9]+)\))/$1\n --> \(${showattachurlbase}$2\)/g;
}
my $diffs = $difftext;
# Remove extra newlines.
@@ -686,9 +675,15 @@ sub get_comments_by_bug {
my $raw = 1; # Do not format comments which are not of type CMT_NORMAL.
my $comments = Bugzilla::Bug::GetComments($id, "oldest_to_newest", $start, $end, $raw);
my $attach_base = correct_urlbase() . 'attachment.cgi?id=';
foreach my $comment (@$comments) {
$comment->{count} = $count++;
# If an attachment was created, then add an URL. (Note: the 'g'lobal
# replace should work with comments with multiple attachments.)
if ($comment->{body} =~ /Created an attachment \(/) {
$comment->{body} =~ s/(Created an attachment \(id=([0-9]+)\))/$1\n --> \($attach_base$2\)/g;
}
}
if (Bugzilla->params->{'insidergroup'}) {