From c11b0256b32d01bcefa4bd7bf3c63c36bc300d56 Mon Sep 17 00:00:00 2001 From: carlos alvarado Date: Wed, 22 Jul 2020 14:07:41 -0500 Subject: [PATCH 1/2] Agenda: Repeated "All day" events show on full day span after first occurence #3394 From the second round, allDay changes from true to 1, as compared to the string true, it will not validate the date for its continuation. Validation against 1 is added directly to compare against numeric value 1 that can be assumed to be true. The database all_day field in table c_calendar_event is set to 1 correctly. --- main/inc/lib/agenda.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/inc/lib/agenda.lib.php b/main/inc/lib/agenda.lib.php index a9d9713eae..ee688b9e34 100644 --- a/main/inc/lib/agenda.lib.php +++ b/main/inc/lib/agenda.lib.php @@ -246,7 +246,7 @@ class Agenda ) { $start = api_get_utc_datetime($start); $end = api_get_utc_datetime($end); - $allDay = isset($allDay) && $allDay === 'true' ? 1 : 0; + $allDay = isset($allDay) && ($allDay === 'true' or $allDay == 1) ? 1 : 0; $id = null; switch ($this->type) { From 7aba80b1bb865f67d1a6e6c779f6e97f6588b0e2 Mon Sep 17 00:00:00 2001 From: carlos alvarado Date: Thu, 23 Jul 2020 08:24:44 -0500 Subject: [PATCH 2/2] Agenda: Repeated "All day" events show on full day span after first occurence #3394 Changed or by || --- main/inc/lib/agenda.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/inc/lib/agenda.lib.php b/main/inc/lib/agenda.lib.php index ee688b9e34..6da2436ee1 100644 --- a/main/inc/lib/agenda.lib.php +++ b/main/inc/lib/agenda.lib.php @@ -246,7 +246,7 @@ class Agenda ) { $start = api_get_utc_datetime($start); $end = api_get_utc_datetime($end); - $allDay = isset($allDay) && ($allDay === 'true' or $allDay == 1) ? 1 : 0; + $allDay = isset($allDay) && ($allDay === 'true' || $allDay == 1) ? 1 : 0; $id = null; switch ($this->type) {