[Koha-patches] [PATCH] Bug 6137: fix a Circulation bug. userenv null

[Julian Maurice]

From: biblibre <dev_patches at biblibre.com>

---
 C4/Circulation.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index b977524..3713e49 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1923,7 +1923,7 @@ sub _GetCircControlBranch {
     my $circcontrol = C4::Context->preference('CircControl');
     my $branch;
 
-    if ($circcontrol eq 'PickupLibrary') {
+    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};
-- 
1.7.4.1