summaryrefslogtreecommitdiff
path: root/plugins/calendar
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2015-03-02 09:56:43 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2015-03-02 09:56:43 (GMT)
commit09f979a248e47a078c1cbd450a21b4448a1f16a0 (patch)
tree4f6215b4c92477f325bd0b447def0cc2a3fa7e5f /plugins/calendar
parent48ff1d045af6a5ccc15be4ab17bfdb5a0b5e84af (diff)
downloadroundcubemail-plugins-kolab-09f979a248e47a078c1cbd450a21b4448a1f16a0.tar.gz
Get exception on first occurrence if exists
Diffstat (limited to 'plugins/calendar')
-rw-r--r--plugins/calendar/drivers/kolab/kolab_calendar.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index 10c256a..a443ee2 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -198,14 +198,14 @@ class kolab_calendar extends kolab_storage_folder_api
$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)
- 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);
}
+ // 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'])) {
$this->get_recurring_events($record, $master['start'], null, $id);
}