gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 25850: (QA follow-up) Match logic in is_holiday 

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit afd88e1d21)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Martin Renvoize 2020-06-29 09:54:58 +01:00 committed by Lucas Gass
parent 238b2af84f
commit 4c0d7b14be
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Koha/Calendar.pm
View File

@ -236,11 +236,18 @@ sub get_push_amt {
my ( $self, $base_date) = @_;
my $dow = $base_date->day_of_week;
# Representation fix
# DateTime object dow (1-7) where Monday is 1
# Arrays are 0-based where 0 = Sunday, not 7.
if ( $dow == 7 ) {
$dow = 0;
}
return (
# We're using Dayweek useDaysMode option
$self->{days_mode} eq 'Dayweek' &&
# It's not a permanently closed day
!$self->{weekly_closed_days}->[$dow % 7]
!$self->{weekly_closed_days}->[$dow]
) ? 7 : 1;
}