From 16c53f836db090621547093db7b8d86c9b5f20cc Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Wed, 11 Jul 2012 14:32:35 +0200 Subject: [PATCH] Bug 8418 - Koha::Calendar is_holiday ignores repeating holidays This is simple fix since day_month_closed_days hash has wrong arguments order and it's not used outside Koha::Calenar code. --- Koha/Calendar.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Koha/Calendar.pm b/Koha/Calendar.pm index dc132cd..26c072f 100644 --- a/Koha/Calendar.pm +++ b/Koha/Calendar.pm @@ -150,7 +150,7 @@ sub is_holiday { $dt->truncate( to => 'days' ); my $day = $dt->day; my $month = $dt->month; - if ( exists $self->{day_month_closed_days}->{$month}->{$day} ) { + if ( exists $self->{day_month_closed_days}->{$day}->{$month} ) { return 1; } if ( $self->{exception_holidays}->contains($dt) ) { @@ -208,7 +208,7 @@ sub hours_between { sub _mockinit { my $self = shift; $self->{weekly_closed_days} = [ 1, 0, 0, 0, 0, 0, 0 ]; # Sunday only - $self->{day_month_closed_days} = { 6 => { 16 => 1, } }; + $self->{day_month_closed_days} = { 16 => { 6 => 1, } }; my $dates = []; $self->{exception_holidays} = DateTime::Set->from_datetimes( dates => $dates ); -- 1.7.2.5