diff options
| author | David Lawrence <dlawrence@mozilla.com> | 2011-10-05 00:25:23 +0200 |
|---|---|---|
| committer | David Lawrence <dlawrence@mozilla.com> | 2011-10-05 00:25:23 +0200 |
| commit | 57584dc4744fea59833ef355f7513690d246c70f (patch) | |
| tree | 805f2b2941eca17eaf97263165d11d9e676ad9d1 /Bugzilla/BugMail.pm | |
| parent | 785580c6c290b93fe25868cfbb5d4e300749de62 (diff) | |
| download | bugzilla-57584dc4744fea59833ef355f7513690d246c70f.tar.gz bugzilla-57584dc4744fea59833ef355f7513690d246c70f.tar.xz | |
more porting work
Diffstat (limited to 'Bugzilla/BugMail.pm')
| -rw-r--r-- | Bugzilla/BugMail.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm index 55eeeab25..c637c3a66 100644 --- a/Bugzilla/BugMail.pm +++ b/Bugzilla/BugMail.pm @@ -267,7 +267,12 @@ sub Send { } # Make sure the user isn't in the nomail list, and the dep check passed. - if ($user->email_enabled && $dep_ok) { + # Upstreaming: when we port to 4.2, check the login names of the + # user objects in the bugmail_recipients hook instead. + if ($user->email_enabled && $dep_ok && + ($user->login !~ /bugs$/) && + ($user->login !~ /\.tld$/)) + { # OK, OK, if we must. Email the user. $sent_mail = sendMail( { to => $user, |