extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
nathangray 2017-10-23 15:27:23 +02:00
parent fdb3202b6b
commit b155c616b8
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1128,6 +1128,10 @@ class calendar_bo
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
$rrule = calendar_rrule::event2rrule($event, !$event['whole_day'], Api\DateTime::$user_timezone->getName()); // true = we operate in usertime, like the rest of calendar_bo $rrule = calendar_rrule::event2rrule($event, !$event['whole_day'], Api\DateTime::$user_timezone->getName()); // true = we operate in usertime, like the rest of calendar_bo
$rrule->rewind();
error_log(__METHOD__ . ' rrule: ' . $rrule . ' current: ' . $rrule->current());
foreach($rrule as $time) {error_log($time);};
$rrule->rewind();
foreach($rrule as $time) foreach($rrule as $time)
{ {
$time->setUser(); // $time is in timezone of event, convert it to usertime used here $time->setUser(); // $time is in timezone of event, convert it to usertime used here

3
calendar/tests/TimezoneTest.php
View File

@ -297,7 +297,7 @@ class TimezoneTest extends \EGroupware\Api\AppTest {
} }
} while ($event_index < count($tz_list)); } while ($event_index < count($tz_list));
/* one specific test /* one specific test */
$tz_combos = array(array( $tz_combos = array(array(
'client' => 'Europe/Berlin', 'client' => 'Europe/Berlin',
'server' => 'Pacific/Tahiti', 'server' => 'Pacific/Tahiti',
@ -316,6 +316,7 @@ class TimezoneTest extends \EGroupware\Api\AppTest {
*/ */
protected function makeEvent($timezones, $times, $whole_day = false) protected function makeEvent($timezones, $times, $whole_day = false)
{ {
error_log($this->tzString($timezones));
$event = array( $event = array(
'title' => ($whole_day ? 'Whole day ' : '')."Test for " . $this->tzString($timezones), 'title' => ($whole_day ? 'Whole day ' : '')."Test for " . $this->tzString($timezones),
'description' => ($whole_day ? 'Whole day ' : '').'Test for test ' . $this->getName() . ' ' . $this->tzString($timezones), 'description' => ($whole_day ? 'Whole day ' : '').'Test for test ' . $this->getName() . ' ' . $this->tzString($timezones),