From 96336bf264f9cac3c5b25cb7513ee2013110052b Mon Sep 17 00:00:00 2001 From: Colin Campbell Date: Fri, 26 Nov 2010 17:19:41 +0000 Subject: [PATCH] Bug 5450 Avoid a name clash in ILSDI modules Content-Type: text/plain; charset="utf-8" C4::ILSDI::Utility exports a subroutine CanBookBeReserved Both ILSDI were also importing a subroutine of that name from C4::Reserves Remove conflict by listing subroutines imported from C4::Reserves explicitly --- C4/ILSDI/Services.pm | 2 +- C4/ILSDI/Utility.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm index c99f2a9..ba0c429 100644 --- a/C4/ILSDI/Services.pm +++ b/C4/ILSDI/Services.pm @@ -26,7 +26,7 @@ use C4::Circulation; use C4::Branch; use C4::Accounts; use C4::Biblio; -use C4::Reserves; +use C4::Reserves qw(AddReserve CancelReserve GetReservesFromBiblionumber GetReservesFromBorrowernumber); use C4::Context; use C4::AuthoritiesMarc; use C4::ILSDI::Utility; diff --git a/C4/ILSDI/Utility.pm b/C4/ILSDI/Utility.pm index 708ba21..8ee1224 100644 --- a/C4/ILSDI/Utility.pm +++ b/C4/ILSDI/Utility.pm @@ -24,7 +24,7 @@ use C4::Members; use C4::Items; use C4::Circulation; use C4::Biblio; -use C4::Reserves; +use C4::Reserves qw(GetReservesFromBorrowernumber); use C4::Context; use C4::Branch qw/GetBranchName/; use Digest::MD5 qw(md5_base64); -- 1.7.3.2