mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-25 16:19:00 +01:00
Pass ignore_acl parameter onto event read, to properly find previous event when ignoring acl
This commit is contained in:
parent
218fc2afb2
commit
a5b18a8c7b
@ -1217,7 +1217,7 @@ class calendar_boupdate extends calendar_bo
|
|||||||
{
|
{
|
||||||
// invalidate the read-cache if it contains the event we store now
|
// invalidate the read-cache if it contains the event we store now
|
||||||
if ($event['id'] == self::$cached_event['id']) self::$cached_event = array();
|
if ($event['id'] == self::$cached_event['id']) self::$cached_event = array();
|
||||||
$old_event = $this->read($event['id'], $event['recurrence'], false, 'server');
|
$old_event = $this->read($event['id'], $event['recurrence'], $ignore_acl, 'server');
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -1414,7 +1414,7 @@ class calendar_boupdate extends calendar_bo
|
|||||||
// Update history
|
// Update history
|
||||||
$tracking = new calendar_tracking($this);
|
$tracking = new calendar_tracking($this);
|
||||||
if (empty($event['id']) && !empty($cal_id)) $event['id']=$cal_id;
|
if (empty($event['id']) && !empty($cal_id)) $event['id']=$cal_id;
|
||||||
$tracking->track($save_event, (array)$old_event);
|
$tracking->track($save_event, $old_event);
|
||||||
|
|
||||||
return $cal_id;
|
return $cal_id;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user