From 1d44809edc5e460f5c5035ebb272f1fe776465cc Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Wed, 5 Oct 2011 16:38:47 -0400 Subject: Some more 4.2 porting fixes --- Bugzilla/BugMail.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Bugzilla/BugMail.pm') 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$/)) -- cgit v1.2.3-24-g4f1b