From: lpsolit%gmail.com <>
Date: Sat, 13 Aug 2005 21:07:43 +0000 (+0000)
Subject: Bug 303824: BugMail should ignore deleted or renamed user accounts - Patch by Frédéri... 
X-Git-Tag: bugzilla-2.20~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d19fc98deb6f28d5c25a00f16192b87414d95cf7;p=thirdparty%2Fbugzilla.git

Bug 303824: BugMail should ignore deleted or renamed user accounts - Patch by Frédéric Buclin <LpSolit@gmail.com> r=wurblzap a=justdave
---

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index faa30b0902..b6c5badfad 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -39,6 +39,7 @@ use base qw(Exporter);
 use Bugzilla::Constants;
 use Bugzilla::Config qw(:DEFAULT $datadir);
 use Bugzilla::Util;
+use Bugzilla::User;
 
 use Mail::Mailer;
 use Mail::Header;
@@ -362,16 +363,20 @@ sub ProcessOneBug($$) {
         if ($old) {
             # You can't stop being the reporter, and mail isn't sent if you
             # remove your vote.
+            # Ignore people whose user account has been deleted or renamed.
             if ($what eq "CC") {
                 foreach my $cc_user (split(/[\s,]+/, $old)) {
-                    push(@{$recipients{DBNameToIdAndCheck($cc_user)}}, REL_CC);
+                    my $uid = login_to_id($cc_user);
+                    push(@{$recipients{$uid}}, REL_CC) if $uid;
                 }
             }
             elsif ($what eq "QAContact") {
-                push(@{$recipients{DBNameToIdAndCheck($old)}}, REL_QA);
+                my $uid = login_to_id($old);
+                push(@{$recipients{$uid}}, REL_QA) if $uid;
             }
             elsif ($what eq "AssignedTo") {
-                push(@{$recipients{DBNameToIdAndCheck($old)}}, REL_ASSIGNEE);
+                my $uid = login_to_id($old);
+                push(@{$recipients{$uid}}, REL_ASSIGNEE) if $uid;
             }
         }
     }