@@ -, +, @@ --- Koha/Calendar.pm | 24 +++++++----------------- t/db_dependent/Holidays.t | 3 +++ 2 files changed, 10 insertions(+), 17 deletions(-) --- a/Koha/Calendar.pm +++ a/Koha/Calendar.pm @@ -95,23 +95,13 @@ sub single_holidays { my $cache = Koha::Cache->get_instance(); my $single_holidays = $cache->get_from_cache('single_holidays'); -=for -$single_holidays looks like this.. - -\ { - CPL [ - [0] 20131122, - [1] 20131123, - [2] 20131124 - ], - MPL [ - [0] 20131122, - [1] 20131123, - [2] 20131124 - ] -} - -=cut + # $single_holidays looks like: + # { + # CPL => [ + # [0] 20131122, + # ... + # ], + # } unless ($single_holidays) { my $dbh = C4::Context->dbh; --- a/t/db_dependent/Holidays.t +++ a/t/db_dependent/Holidays.t @@ -97,6 +97,9 @@ is( $koha_calendar->is_holiday($monday), 0, 'Monday is not a closed day' ); is( $koha_calendar->is_holiday($christmas), 1, 'Christmas is a closed day' ); is( $koha_calendar->is_holiday($newyear), 1, 'New Years day is a closed day' ); +$dbh->do("DELETE FROM repeatable_holidays"); +$dbh->do("DELETE FROM special_holidays"); + my $custom_holiday = DateTime->new( year => 2013, month => 11, --