Bug 284590: When using SMTP, emails are not sent to the CC list associated with the flag type - Patch by Teemu Mannermaa <wicked@etlicon.fi> r=wicked a=justdave

webtools/bugzilla/Bugzilla/Flag.pm

@@ -977,7 +977,6 @@ sub notify {
     my ($flag, $template_file) = @_;
 
     my $template = Bugzilla->template;
-    my $vars = {};
 
     # There is nobody to notify.
     return unless ($flag->{'addressee'} || $flag->{'type'}->{'cc_list'});
@@ -1007,17 +1006,21 @@ sub notify {
     # If there is nobody left to notify, return.
     return unless ($flag->{'addressee'} || $flag->{'type'}->{'cc_list'});
 
-    $vars->{'flag'} = $flag;
-    
-    my $message;
-    my $rv = 
-      $template->process($template_file, $vars, \$message);
-    if (!$rv) {
-        Bugzilla->cgi->header();
-        ThrowTemplateError($template->error());
-    }
+    # Process and send notification for each recipient
+    foreach my $to ($flag->{'addressee'} ? $flag->{'addressee'}->email : '',
+                    split(/[, ]+/, $flag->{'type'}->{'cc_list'}))
+    {
+        next unless $to;
+        my $vars = { 'flag' => $flag, 'to' => $to };
+        my $message;
+        my $rv = $template->process($template_file, $vars, \$message);
+        if (!$rv) {
+            Bugzilla->cgi->header();
+            ThrowTemplateError($template->error());
+        }
 
-    Bugzilla::BugMail::MessageToMTA($message);
+        Bugzilla::BugMail::MessageToMTA($message);
+    }
 }
 
 # Cancel all request flags from the attachment being obsoleted.

webtools/bugzilla/template/en/default/request/email.txt.tmpl

@@ -38,8 +38,7 @@
   [% subject_status = statuses.${flag.status} %]
 [% END %]
 From: bugzilla-request-daemon
-To: [% flag.addressee.email %]
-CC: [% flag.type.cc_list %]
+To: [% to %]
 Subject: [% flag.type.name %] [%+ subject_status %]: [[% terms.Bug %] [%+ flag.target.bug.id %]] [% flag.target.bug.summary %]
 [%- IF flag.target.attachment.exists %] :
   [Attachment [% flag.target.attachment.id %]] [% flag.target.attachment.summary %][% END %]