summaryrefslogtreecommitdiffstats
path: root/Bugzilla/BugMail.pm
diff options
context:
space:
mode:
authorDavid Lawrence <dlawrence@mozilla.com>2011-10-05 22:38:47 +0200
committerDavid Lawrence <dlawrence@mozilla.com>2011-10-05 22:38:47 +0200
commit1d44809edc5e460f5c5035ebb272f1fe776465cc (patch)
treebe71e1a406799044449303b7a4c09854046efe08 /Bugzilla/BugMail.pm
parentbefdcc8f9a30f55e91227bac0ee1813a661002b3 (diff)
downloadbugzilla-1d44809edc5e460f5c5035ebb272f1fe776465cc.tar.gz
bugzilla-1d44809edc5e460f5c5035ebb272f1fe776465cc.tar.xz
Some more 4.2 porting fixes
Diffstat (limited to 'Bugzilla/BugMail.pm')
-rw-r--r--Bugzilla/BugMail.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index c637c3a66..60ff45e38 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -267,8 +267,12 @@ sub Send {
}
# Make sure the user isn't in the nomail list, and the dep check passed.
- # Upstreaming: when we port to 4.2, check the login names of the
- # user objects in the bugmail_recipients hook instead.
+ # BMO: normally we would check the login names of the
+ # user objects in the bugmail_recipients hook instead. There we could
+ # remove the (bugs|tld)$ addresses from the recipients. But the hook comes
+ # to early before watchers are decided and these addresses need to be
+ # there for this to work. This may change with recent enhancements to
+ # component watching. need to investigate further.
if ($user->email_enabled && $dep_ok &&
($user->login !~ /bugs$/) &&
($user->login !~ /\.tld$/))