From d35840f11dfdc74baed4acdfb6a49939bd5916a0 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 18 Feb 2020 16:13:11 +0100 Subject: [PATCH] Bug 23384: Fix use statement order for ArticleRequest::Status Koha::ArticleRequest is used by Koha::ArticleRequests so Koha::ArticleRequest::Status should not be needed in Koha::ArticleRequest. Also Koha::ArticleRequest::Status must be loaded before Koha::ArticleRequest Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize Signed-off-by: Joy Nelson (cherry picked from commit 00379c189976ac9e7e2429f5261a0b562206fc5d) Signed-off-by: Lucas Gass --- Koha/ArticleRequest.pm | 1 - Koha/ArticleRequests.pm | 2 +- Koha/Patron.pm | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Koha/ArticleRequest.pm b/Koha/ArticleRequest.pm index f540b802da..1787ef9e47 100644 --- a/Koha/ArticleRequest.pm +++ b/Koha/ArticleRequest.pm @@ -26,7 +26,6 @@ use Koha::Patrons; use Koha::Biblios; use Koha::Items; use Koha::Libraries; -use Koha::ArticleRequest::Status; use Koha::DateUtils qw(dt_from_string); use base qw(Koha::Object); diff --git a/Koha/ArticleRequests.pm b/Koha/ArticleRequests.pm index c43c23ea8e..9659650d24 100644 --- a/Koha/ArticleRequests.pm +++ b/Koha/ArticleRequests.pm @@ -23,8 +23,8 @@ use Carp; use Koha::Database; -use Koha::ArticleRequest; use Koha::ArticleRequest::Status; +use Koha::ArticleRequest; use base qw(Koha::Objects); diff --git a/Koha/Patron.pm b/Koha/Patron.pm index 0352255bb4..a37e151b8d 100644 --- a/Koha/Patron.pm +++ b/Koha/Patron.pm @@ -27,6 +27,8 @@ use Unicode::Normalize; use C4::Context; use C4::Log; +use Koha::Account; +use Koha::ArticleRequests; use Koha::AuthUtils; use Koha::Checkouts; use Koha::Database; -- 2.20.1