holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Calendar - Fix bug where recurring events were moved to server time when adding a recurrence exception

Browse Source
This commit is contained in:
nathangray 2017-05-10 13:47:13 -06:00
parent 32778f20bf
commit ce990f65ae
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -890,11 +890,13 @@ class calendar_bo
} }
if (!isset($event['start']) || !isset($event['end'])) if (!isset($event['start']) || !isset($event['end']))
{ {
$event['start'] = $event_read['start']; $event['start'] = $this->date2usertime($event_read['start']);
$event['end'] = $event_read['end']; $event['end'] = $this->date2usertime($event_read['end']);
} }
} }
if (!$start) $start = $event['start']; if (!$start) $start = $event['start'];
$start_obj = new Api\DateTime($start);
$read_start = new Api\DateTime($event_read['start']);
$events = array(); $events = array();
$this->insert_all_recurrences($event,$start,$this->date2usertime($this->config['horizont']),$events); $this->insert_all_recurrences($event,$start,$this->date2usertime($this->config['horizont']),$events);