From 1078c4da84d79f93ef7f8bbffc5f0c8cb2a1a274 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Fri, 26 Apr 2019 16:51:30 +0000 Subject: [PATCH] Fixed holidays display for subgroups. --- WEB-INF/lib/form/Calendar.class.php | 3 +-- WEB-INF/templates/footer.tpl | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php index 6c4a4223..a8455a87 100644 --- a/WEB-INF/lib/form/Calendar.class.php +++ b/WEB-INF/lib/form/Calendar.class.php @@ -172,9 +172,8 @@ class Calendar extends FormElement { } // holidays - //if ($this->showHolidays) { global $user; - if ($user->show_holidays) { + if ($user->isOptionEnabled('show_holidays')) { foreach ($this->holidays as $day) { if($day == $date) { $stl_cell = ' class="CalendarDayHoliday"'; diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index e806ad80..c4dd4795 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.19.3.4987 | Copyright © Anuko | +  Anuko Time Tracker 1.19.3.4988 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} -- 2.20.1