From f5421b8a1c567e63a3d9b5e01659d0fb7937f196 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= Date: Mon, 14 Apr 2014 21:39:40 +0200 Subject: [PATCH] Bug 987205: Bugzilla crashes because it tries to import a non-exported login_token() subroutine from Bugzilla::Auth::Login::Cookie r=dkl a=justdave --- Bugzilla/Auth/Login.pm | 2 +- Bugzilla/Auth/Login/Cookie.pm | 3 +++ Bugzilla/Auth/Persist/Cookie.pm | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Bugzilla/Auth/Login.pm b/Bugzilla/Auth/Login.pm index f1aad4108c..290cb42ffd 100644 --- a/Bugzilla/Auth/Login.pm +++ b/Bugzilla/Auth/Login.pm @@ -8,7 +8,7 @@ package Bugzilla::Auth::Login; 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 2e31c19d57..b203573077 100644 --- a/Bugzilla/Auth/Login/Cookie.pm +++ b/Bugzilla/Auth/Login/Cookie.pm @@ -6,8 +6,11 @@ # defined by the Mozilla Public License, v. 2.0. package Bugzilla::Auth::Login::Cookie; + use strict; + 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 39dae147dd..fe37551c9c 100644 --- a/Bugzilla/Auth/Persist/Cookie.pm +++ b/Bugzilla/Auth/Persist/Cookie.pm @@ -13,8 +13,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 { -- 2.47.2