plugins/calendar

[Aleksander Machniak]

 plugins/calendar/drivers/kolab/kolab_calendar.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 56928b74ebb2a24b425d24706d3302ca004249b2
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Wed Dec 5 12:05:24 2012 +0100

    Fix performance issue in kolab_calendar::get_event() (#1411)

diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index 6f0568c..0a3d273 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -177,7 +177,7 @@ class kolab_calendar
     // event not found, maybe a recurring instance is requested
     if (!$this->events[$id]) {
       $master_id = preg_replace('/-\d+$/', '', $id);
-      if ($record = $this->storage->get_object($master_id))
+      if ($master_id != $id && ($record = $this->storage->get_object($master_id)))
         $this->events[$master_id] = $this->_to_rcube_event($record);
 
       if (($master = $this->events[$master_id]) && $master['recurrence']) {