extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Turn on some more debugging to try to figure out what goes wrong on Travis

Browse Source
This commit is contained in:
nathangray 2017-10-23 16:11:41 +02:00
parent 23d44785a9
commit 7ee539ab3a
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_bo.inc.php
View File

@ -1114,6 +1114,7 @@ class calendar_bo
$event_start_ts = $this->date2ts($event['start']); $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! $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 $end is before recur_enddate, use it instead
if (!$event['recur_enddate'] || $this->date2ts($event['recur_enddate']) > $this->date2ts($end)) 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'] = is_a($event['recur_enddate'],'DateTime') ?
$event['recur_enddate'] : $event['recur_enddate'] :
new Api\DateTime($event['recur_enddate'], calendar_timezones::DateTimeZone($event['tzid'])); 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 exceptions, as we need to add them as recurrence too, but marked as exception
unset($event['recur_exception']); unset($event['recur_exception']);
// loop over all recurrences and insert them, if they are after $start // loop over all recurrences and insert them, if they are after $start

1
calendar/tests/TimezoneTest.php
View File

@ -331,6 +331,7 @@ class TimezoneTest extends \EGroupware\Api\AppTest {
$GLOBALS['egw_info']['user']['account_id'] => 'A' $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; return $event;
} }