plugins/calendar

Thomas Brüderli bruederli at kolabsys.com
Mon Mar 2 10:57:08 CET 2015


 plugins/calendar/drivers/kolab/kolab_calendar.php |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 09f979a248e47a078c1cbd450a21b4448a1f16a0
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Mon Mar 2 10:56:43 2015 +0100

    Get exception on first occurrence if exists

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);
       }




More information about the commits mailing list