Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get exception on first occurrence if exists

Browse source
This commit is contained in:
Thomas Bruederli 2015-03-02 10:56:43 +01:00
parent 48ff1d045a
commit 09f979a248
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/calendar/drivers/kolab/kolab_calendar.php
View file

@ -198,14 +198,14 @@ class kolab_calendar extends kolab_storage_folder_api
$master = $this->_to_driver_event($record); $master = $this->_to_driver_event($record);
} }
// check for match on the first instance already
if ($master['_instance'] && $master['_instance'] == $instance_id) {
$this->events[$id] = $master;
}
// check for match in top-level exceptions (aka loose single occurrences) // check for match in top-level exceptions (aka loose single occurrences)
else if ($master && $master['_formatobj'] && ($instance = $master['_formatobj']->get_instance($instance_id))) { if ($master && $master['_formatobj'] && ($instance = $master['_formatobj']->get_instance($instance_id))) {
$this->events[$id] = $this->_to_driver_event($instance); $this->events[$id] = $this->_to_driver_event($instance);
} }
// check for match on the first instance already
else if ($master['_instance'] && $master['_instance'] == $instance_id) {
$this->events[$id] = $master;
}
else if ($master && is_array($master['recurrence'])) { else if ($master && is_array($master['recurrence'])) {
$this->get_recurring_events($record, $master['start'], null, $id); $this->get_recurring_events($record, $master['start'], null, $id);
} }