diff options
| author | Frédéric Buclin <LpSolit@gmail.com> | 2014-04-14 21:29:55 +0200 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2014-04-14 21:29:55 +0200 |
| commit | db8d9946f92f847a26bca5eb45f31ecaf7f031dd (patch) | |
| tree | 0f299175da6669b12f515f12fe8ef4121ee24fbc | |
| parent | 32931bb0370328c142e9d63f410d94f9db3c764d (diff) | |
| download | bugzilla-db8d9946f92f847a26bca5eb45f31ecaf7f031dd.tar.gz bugzilla-db8d9946f92f847a26bca5eb45f31ecaf7f031dd.tar.xz | |
Bug 987205: Bugzilla crashes because it tries to import a non-exported login_token() subroutine from Bugzilla::Auth::Login::Cookie
r=dkl a=justdave
| -rw-r--r-- | Bugzilla/Auth/Login.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/Auth/Login/Cookie.pm | 3 | ||||
| -rw-r--r-- | Bugzilla/Auth/Persist/Cookie.pm | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/Bugzilla/Auth/Login.pm b/Bugzilla/Auth/Login.pm index ddc172689..33d63a425 100644 --- 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 d2f9e2f1e..29e2310a0 100644 --- 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 939a1ac9c..5a9857cba 100644 --- 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 { |