Bug 100953: Move data/nomail into the DB and implement a UI to edit it

Patch by A. Karl Kornel <karl@kornel.name> r=wurblzap a=justdave

1 files changed, 1 insertions, 16 deletions

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 1b2fb5429..dd92cd3b4 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -57,20 +57,6 @@ use constant REL_NAMES => {
     REL_VOTER   , "Voter"
 };
 
-sub _read_nomail {
-    my $nomail = Bugzilla->request_cache->{bugmail_nomail};
-    return $nomail if $nomail;
-    if (open(NOMAIL, '<', bz_locations->{'datadir'} . "/nomail")) {
-        while (<NOMAIL>) {
-            $nomail->{trim($_)} = 1;
-        }
-        close(NOMAIL);
-    }
-    Bugzilla->request_cache->{bugmail_nomail} = $nomail;
-    return $nomail;
-}
-
-
 sub FormatTriple {
     my ($a, $b, $c) = (@_);
     $^A = "";
@@ -465,8 +451,7 @@ sub ProcessOneBug {
 
             # Make sure the user isn't in the nomail list, and the insider and 
             # dep checks passed.
-            my $nomail = _read_nomail();
-            if ((!$nomail->{$user->login}) &&
+            if ($user->email_enabled &&
                 $insider_ok &&
                 $dep_ok)
             {