From bcbb3ba91f5dc4f13fbb0a49f8a5e441d686b34d Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" <> Date: Fri, 4 Dec 2009 15:19:08 +0000 Subject: Bug 532911: Remove use of Bugzilla::User from Bugzilla::Install::DB (modules may not be used like that during Install::DB) Patch by Max Kanat-Alexander (module owner) a=mkanat --- Bugzilla/Install/DB.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm index 0ae909ecd..bada40dad 100644 --- a/Bugzilla/Install/DB.pm +++ b/Bugzilla/Install/DB.pm @@ -2817,13 +2817,13 @@ sub _move_data_nomail_into_db { SET disable_mail = 1 WHERE userid = ?'); foreach my $user_to_check (keys %nomail) { - my $uid; - if ($uid = Bugzilla::User::login_to_id($user_to_check)) { - my $user = new Bugzilla::User($uid); - print "\tDisabling email for user ", $user->email, "\n"; - $query->execute($user->id); - delete $nomail{$user->email}; - } + my $uid = $dbh->selectrow_array( + 'SELECT userid FROM profiles WHERE login_name = ?', + undef, $user_to_check); + next if !$uid; + print "\tDisabling email for user $user_to_check\n"; + $query->execute($uid); + delete $nomail{$user_to_check}; } # If there are any nomail entries remaining, move them to nomail.bad -- cgit v1.2.3-24-g4f1b