From 0bdbec1fc8d2cceaf514ec25afc53ea1cedc41f5 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 6 Aug 2010 09:35:43 +0000
Subject: [PATCH] adapted backport of ralfs commit to trunk to improve
 performance for groupdav/caldav by not checking exeptions for refering to a
 existing (and refering) master

---
 calendar/inc/class.calendar_groupdav.inc.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index 4d27c1d010..9a0ed41df5 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -185,10 +185,11 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
 			foreach($events as $k => $event)
 			{
 				if ($this->client_shared_uid_exceptions &&
-						$event['reference'] && $event['uid'] &&
-						($masterId = array_shift($this->bo->find_event(array('uid' => $event['uid']), 'master'))) &&
-						($master = $this->bo->read($masterId, 0, false, 'server')) &&
-						array_search($event['reference'], $master['recur_exception']) !== false)
+						$event['reference'] && $event['uid']// &&
+						//($masterId = array_shift($this->bo->find_event(array('uid' => $event['uid']), 'master'))) &&
+						//($master = $this->bo->read($masterId, 0, false, 'server')) &&
+						//array_search($event['reference'], $master['recur_exception']) !== false
+				)
 				{
 					// this exception will be handled with the series master
 					unset($events[$k]);