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

This commit is contained in:
Klaus Leithoff 2010-08-06 09:35:43 +00:00
parent d893fe7af0
commit 0bdbec1fc8

View File

@ -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]);