[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] working days calculation fix when end date falls on a holiday - getting...

Victor Emanouilov pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
930554ee by Victor Emanouilov at 2025-09-12T10:08:20+03:00
[FIX] working days calculation fix when end date falls on a holiday - getting events did not get the current date because of timestamp comparison issue

- - - - -


1 changed file:

- lib/calendar/calendarlib.php


Changes:

=====================================
lib/calendar/calendarlib.php
=====================================
@@ -2325,7 +2325,7 @@ class CalendarLib extends TikiLib
         if (empty($prefs['calendar_holidays'])) {
             return 0;
         }
-        $events = $this->get_events($prefs['calendar_holidays'], [], null, min($ts1, $ts2), max($ts1, $ts2));
+        $events = $this->get_events($prefs['calendar_holidays'], [], null, min($ts1, $ts2), max($ts1, $ts2)+1);
         $dates = [];
         foreach ($events as $event) {
             $start = $event['start'];



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/930554eee16462c2839620387c53aaffdae71322

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/930554eee16462c2839620387c53aaffdae71322
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs