From 4d11e020e8157345f328a309761809de3b53472d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 14 Mar 2013 14:47:06 +0000 Subject: [PATCH] * Calendar/CalDAV: fixed recuring event disapeared from device, if a rejected recurrence existed and a change from an other user caused a reload (412 Precondition Failed) --- calendar/inc/class.calendar_bo.inc.php | 2 +- calendar/inc/class.calendar_groupdav.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php index 40c1cbcc11..bc4b974b99 100644 --- a/calendar/inc/class.calendar_bo.inc.php +++ b/calendar/inc/class.calendar_bo.inc.php @@ -1160,7 +1160,7 @@ class calendar_bo elseif (!is_numeric($uid)) { // if the owner only grants EGW_ACL_FREEBUSY we are not interested in the recources explicit rights - if ($grant == EGW_ACL_FREEBUSY) break; + if ($grant == EGW_ACL_FREEBUSY) continue; // if we have a resource as participant $resource = $this->resource_info($uid); $grant |= $resource['rights']; diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php index f95287e04b..8ecdffc97f 100644 --- a/calendar/inc/class.calendar_groupdav.inc.php +++ b/calendar/inc/class.calendar_groupdav.inc.php @@ -1286,7 +1286,7 @@ class calendar_groupdav extends groupdav_handler { if (strpos($column=self::$path_attr,'_') === false) $column = 'cal_'.$column; - $event = $this->bo->read(array($column => $id, 'cal_deleted IS NULL'), null, true, 'server'); + $event = $this->bo->read(array($column => $id, 'cal_deleted IS NULL', 'cal_reference=0'), null, true, 'server'); if ($event) $event = array_shift($event); // read with array as 1. param, returns an array of events! if (!($retval = $this->bo->check_perms(EGW_ACL_FREEBUSY,$event, 0, 'server')))