From a33a5f6ed8bf4f8c20ccad3d4cc379059cdc2fbd Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Wed, 8 Aug 2007 06:52:22 +0000 Subject: Bug 279318: Flag notifications are sent even if emails are turned off for the addressee - Patch by Tiago R. Mello r/a=LpSolit --- Bugzilla/Flag.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Bugzilla/Flag.pm') diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm index 7473ea1f1..19ecf7fa9 100644 --- a/Bugzilla/Flag.pm +++ b/Bugzilla/Flag.pm @@ -1047,9 +1047,13 @@ sub notify { # If there is nobody left to notify, return. return unless ($flag->{'addressee'} || $flag->type->cc_list); + my @recipients = split(/[, ]+/, $flag->type->cc_list); + # Only notify if the addressee is allowed to receive the email. + if ($flag->{'addressee'} && $flag->{'addressee'}->email_enabled) { + push @recipients, $flag->{'addressee'}->email; + } # Process and send notification for each recipient - foreach my $to ($flag->{'addressee'} ? $flag->{'addressee'}->email : '', - split(/[, ]+/, $flag->type->cc_list)) + foreach my $to (@recipients) { next unless $to; my $vars = { 'flag' => $flag, -- cgit v1.2.3-24-g4f1b