http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6137
--- Comment #2 from Chris Cormack <[email protected]> 2011-05-16 22:23:30 UTC --- <<<<<<< HEAD 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'}; >>>>>>> Bug 6137: fix a Circulation bug. userenv null Patch conflicted, I chose the change in this patch to resolve the conflict as it is a more complete fix -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
