From 092e98df273c113d05e25732df0fb8441407125c Mon Sep 17 00:00:00 2001 From: biblibre Date: Tue, 8 Mar 2011 10:28:38 +0100 Subject: [Signed Off] [PATCH] Bug 6137: fix a Circulation bug. userenv null Signed-off-by: Chris Cormack --- C4/Circulation.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 9a2db4c..3713e49 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1923,8 +1923,8 @@ sub _GetCircControlBranch { my $circcontrol = C4::Context->preference('CircControl'); my $branch; - if ($circcontrol eq 'PickupLibrary') { - $branch= C4::Context->userenv->{'branch'} if C4::Context->userenv; + if ($circcontrol eq 'PickupLibrary' and (C4::Context->userenv and C4::Context->userenv->{'branch'}) ) { + $branch= C4::Context->userenv->{'branch'}; } elsif ($circcontrol eq 'PatronLibrary') { $branch=$borrower->{branchcode}; } else { -- 1.7.4.1