From 7ee539ab3af31a9c7dfddddc97d66b1d4c178148 Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 23 Oct 2017 16:11:41 +0200 Subject: [PATCH] Turn on some more debugging to try to figure out what goes wrong on Travis --- calendar/inc/class.calendar_bo.inc.php | 2 ++ calendar/tests/TimezoneTest.php | 1 + 2 files changed, 3 insertions(+) diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php index ac90ececc6..281fa9e4f1 100644 --- a/calendar/inc/class.calendar_bo.inc.php +++ b/calendar/inc/class.calendar_bo.inc.php @@ -1114,6 +1114,7 @@ class calendar_bo $event_start_ts = $this->date2ts($event['start']); $event_length = $this->date2ts($event['end']) - $event_start_ts; // we use a constant event-length, NOT a constant end-time! + error_log(__METHOD__ . ':'.__LINE__ ." Event end date: " . Api\DateTime::to($event['recur_enddate'], Api\DateTime::DATABASE)); // if $end is before recur_enddate, use it instead if (!$event['recur_enddate'] || $this->date2ts($event['recur_enddate']) > $this->date2ts($end)) { @@ -1124,6 +1125,7 @@ class calendar_bo $event['recur_enddate'] = is_a($event['recur_enddate'],'DateTime') ? $event['recur_enddate'] : new Api\DateTime($event['recur_enddate'], calendar_timezones::DateTimeZone($event['tzid'])); + error_log(__METHOD__ . ':'.__LINE__ ." Event end date: " . Api\DateTime::to($event['recur_enddate'], Api\DateTime::DATABASE)); // unset exceptions, as we need to add them as recurrence too, but marked as exception unset($event['recur_exception']); // loop over all recurrences and insert them, if they are after $start diff --git a/calendar/tests/TimezoneTest.php b/calendar/tests/TimezoneTest.php index 76477cccff..5de5ed1e8c 100644 --- a/calendar/tests/TimezoneTest.php +++ b/calendar/tests/TimezoneTest.php @@ -331,6 +331,7 @@ class TimezoneTest extends \EGroupware\Api\AppTest { $GLOBALS['egw_info']['user']['account_id'] => 'A' ) ); + error_log(__METHOD__ . ':'.__LINE__ ." Event end date: " . Api\DateTime::to($event['recur_enddate'], Api\DateTime::DATABASE)); return $event; }