Bug 987205: Bugzilla crashes because it tries to import a non-exported login_token...

r=dkl a=justdave

diff --git a/Bugzilla/Auth/Login.pm b/Bugzilla/Auth/Login.pm
index ddc1726894b1838c2fbc7fb940d78534edd4d14c..33d63a425cddab64d07e3e5c6a01d00a5044a8a0 100644 (file)
--- a/Bugzilla/Auth/Login.pm
+++ b/Bugzilla/Auth/Login.pm
@@ -9,7 +9,7 @@ package Bugzilla::Auth::Login;
 
 use 5.10.1;
 use strict;
-use fields qw(_login_token);
+use fields qw();
 
 # Determines whether or not a user can logout. It's really a subroutine,
 # but we implement it here as a constant. Override it in subclasses if

diff --git a/Bugzilla/Auth/Login/Cookie.pm b/Bugzilla/Auth/Login/Cookie.pm
index d2f9e2f1ea5999b72941a00268c037d341df51b9..29e2310a0a0a73137579dce74de691eb68ca405f 100644 (file)
--- a/Bugzilla/Auth/Login/Cookie.pm
+++ b/Bugzilla/Auth/Login/Cookie.pm
@@ -10,7 +10,8 @@ package Bugzilla::Auth::Login::Cookie;
 use 5.10.1;
 use strict;
 
-use parent qw(Bugzilla::Auth::Login);
+use base qw(Bugzilla::Auth::Login);
+use fields qw(_login_token);
 
 use Bugzilla::Constants;
 use Bugzilla::Util;

diff --git a/Bugzilla/Auth/Persist/Cookie.pm b/Bugzilla/Auth/Persist/Cookie.pm
index 939a1ac9c5c7f7719abbba263966b01f7f40cdd3..5a9857cbaebe2422dcdef06d8a57ea97fafe7a43 100644 (file)
--- a/Bugzilla/Auth/Persist/Cookie.pm
+++ b/Bugzilla/Auth/Persist/Cookie.pm
@@ -15,8 +15,6 @@ use Bugzilla::Constants;
 use Bugzilla::Util;
 use Bugzilla::Token;
 
-use Bugzilla::Auth::Login::Cookie qw(login_token);
-
 use List::Util qw(first);
 
 sub new {