extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 07:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

* 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)

Browse Source
This commit is contained in:
Ralf Becker 2013-03-14 14:47:06 +00:00
parent cbf7abc4fb
commit 4d11e020e8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_bo.inc.php
View File

@ -1160,7 +1160,7 @@ class calendar_bo
elseif (!is_numeric($uid)) elseif (!is_numeric($uid))
{ {
// if the owner only grants EGW_ACL_FREEBUSY we are not interested in the recources explicit rights // 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 // if we have a resource as participant
$resource = $this->resource_info($uid); $resource = $this->resource_info($uid);
$grant |= $resource['rights']; $grant |= $resource['rights'];

2
calendar/inc/class.calendar_groupdav.inc.php
View File

@ -1286,7 +1286,7 @@ class calendar_groupdav extends groupdav_handler
{ {
if (strpos($column=self::$path_attr,'_') === false) $column = 'cal_'.$column; 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 ($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'))) if (!($retval = $this->bo->check_perms(EGW_ACL_FREEBUSY,$event, 0, 'server')))