From b2c55f8440a7d8aeae310b299d64b4555b662775 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 12 Feb 2021 12:10:31 +0100 Subject: [PATCH] Bug 27068: Don't 'cache' Koha::Libraries Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart (cherry picked from commit 20c97bca2dc1b742dff5d8828cf83a5543571e91) Signed-off-by: Fridolin Somers (cherry picked from commit 3d7812c07fe0b71e05da5917e03c1a31626b2cee) Signed-off-by: Andrew Fuerste-Henry --- C4/HoldsQueue.pm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm index a983382262..587080b56a 100755 --- a/C4/HoldsQueue.pm +++ b/C4/HoldsQueue.pm @@ -370,28 +370,21 @@ sub GetItemsAvailableToFillHoldRequestsForBib { =cut -our $libraries = {}; sub _checkHoldPolicy { my ($item, $request) = @_; return 0 unless $item->{holdallowed}; return 0 if $item->{holdallowed} == 1 && $item->{homebranch} ne $request->{borrowerbranch}; - $libraries->{$item->{homebranch}} ||= Koha::Libraries->find($item->{homebranch}); - my $library = $libraries->{$item->{homebranch}}; - - return 0 if $item->{'holdallowed'} == 3 && !$library->validate_hold_sibling({branchcode => $request->{borrowerbranch}}); + return 0 if $item->{'holdallowed'} == 3 && !Koha::Libraries->find($item->{homebranch})->validate_hold_sibling({branchcode => $request->{borrowerbranch}}); my $hold_fulfillment_policy = $item->{hold_fulfillment_policy}; - return 0 if $hold_fulfillment_policy eq 'holdgroup' && !$library->validate_hold_sibling({branchcode => $request->{branchcode}}); + return 0 if $hold_fulfillment_policy eq 'holdgroup' && !Koha::Libraries->find($item->{homebranch})->validate_hold_sibling({branchcode => $request->{branchcode}}); return 0 if $hold_fulfillment_policy eq 'homebranch' && $request->{branchcode} ne $item->{$hold_fulfillment_policy}; return 0 if $hold_fulfillment_policy eq 'holdingbranch' && $request->{branchcode} ne $item->{$hold_fulfillment_policy}; - $libraries->{$request->{borrowerbranch}} ||= Koha::Libraries->find($request->{borrowerbranch}); - my $patronLibrary = $libraries->{$request->{borrowerbranch}}; - - return 0 if $hold_fulfillment_policy eq 'patrongroup' && !$patronLibrary->validate_hold_sibling({branchcode => $request->{branchcode}}); + return 0 if $hold_fulfillment_policy eq 'patrongroup' && !Koha::Libraries->find($request->{borrowerbranch})->validate_hold_sibling({branchcode => $request->{branchcode}}); return 1; -- 2.39.5