From 52b113cc1a6a208744ec92ad1b2c91d463ff9202 Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Mon, 12 May 2014 14:39:23 -0400
Subject: Backout of Bug 1001462 - Bug.search causes error when using simple
 token auth and specifying 'token' instead of 'Bugzilla_token'

---
 Bugzilla/WebService/User.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'Bugzilla/WebService/User.pm')

diff --git a/Bugzilla/WebService/User.pm b/Bugzilla/WebService/User.pm
index 112d336d7..f8358f78d 100644
--- a/Bugzilla/WebService/User.pm
+++ b/Bugzilla/WebService/User.pm
@@ -54,10 +54,16 @@ sub login {
 
     # Username and password params are required 
     foreach my $param ("login", "password") {
-        (!defined $params->{$param} && !defined $params->{'Bugzilla_' . $param})
+        defined $params->{$param} 
             || ThrowCodeError('param_required', { param => $param });
     }
 
+    # Make sure the CGI user info class works if necessary.
+    my $input_params = Bugzilla->input_params;
+    $input_params->{'Bugzilla_login'} =  $params->{login};
+    $input_params->{'Bugzilla_password'} = $params->{password};
+    $input_params->{'Bugzilla_restrictlogin'} = $params->{restrict_login};
+
     my $user = Bugzilla->login();
 
     my $result = { id => $self->type('int', $user->id) };
-- 
cgit v1.2.3-24-g4f1b