Bug 279318: Flag notifications are sent even if emails are turned off for the…

Bug 279318: Flag notifications are sent even if emails are turned off for the addressee - Patch by Tiago R. Mello <timello@gmail.com> r/a=LpSolit

Bug 279318: Flag notifications are sent even if emails are turned off for the…
a33a5f6e · lpsolit%gmail.com · 4d1b66af · a33a5f6e
Commit a33a5f6e authored Aug 08, 2007 by lpsolit%gmail.com
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

Flag.pm Bugzilla/Flag.pm +6 -2

No files found.
--- 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,