[Koha-cvs] koha/C4 Koha.pm [dev_week]

[Ryan Higgins]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Ryan Higgins <rych>     07/04/19 20:51:38

Modified files:
        C4             : Koha.pm 

Log message:
        return userenv->{branch} instead of branches[0] if we dont have a 
branch set.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Koha.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.22.2.4.2.10&r2=1.22.2.4.2.11

Patches:
Index: Koha.pm
===================================================================
RCS file: /sources/koha/koha/C4/Koha.pm,v
retrieving revision 1.22.2.4.2.10
retrieving revision 1.22.2.4.2.11
diff -u -b -r1.22.2.4.2.10 -r1.22.2.4.2.11
--- Koha.pm     18 Mar 2007 03:45:54 -0000      1.22.2.4.2.10
+++ Koha.pm     19 Apr 2007 20:51:38 -0000      1.22.2.4.2.11
@@ -608,6 +608,7 @@
     my($query, $branches) = @_; # get branch for this query from branches
     my $branch = $query->param('branch');
     ($branch) || ($branch = $query->cookie('branch'));
+    ($branches->{$branch}) || ( $branch = C4::Context->userenv->{'branch'} );
     ($branches->{$branch}) || ($branch=(keys %$branches)[0]);
     return $branch;
 }