Bug 3346: Fixes invalid XHTML in opac-shelves.tmpl

[koha.git] / tools / holidays.pl

diff --git a/tools/holidays.pl b/tools/holidays.pl
index c92e521..047f226 100755 (executable)
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -57,7 +57,7 @@ my $branch= $input->param('branch') || C4::Context->userenv->{'branch'};
 # Set all the branches.
 my $onlymine=(C4::Context->preference('IndependantBranches') &&
               C4::Context->userenv &&
-              C4::Context->userenv->{flags} !=1  &&
+              C4::Context->userenv->{flags} % 2 !=1  &&
               C4::Context->userenv->{branch}?1:0);
 if ( $onlymine ) { 
     $branch = C4::Context->userenv->{'branch'};
@@ -72,7 +72,8 @@ for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{b
             );
     push @branchloop, \%row;
 }
-
+# branches calculated - put branch codes in a single string so they can be passed in a form
+my $branchcodes = join("|", keys %$branches);
 
 # Get all the holidays
 
@@ -139,6 +140,7 @@ $template->param(WEEK_DAYS_LOOP => \@week_days,
                                DAY_MONTH_HOLIDAYS_LOOP => \@day_month_holidays,
                                calendardate => $calendardate,
                                keydate => $keydate,
+                               branchcodes => $branchcodes,
                                branch => $branch
        );