Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug where event occurrence with no attendees inherited attendees of the event (#5300)

Browse source 
The object was created/updated corretly, the bug was in exception properties resolving.
This commit is contained in:
Aleksander Machniak 2016-02-11 11:58:33 +01:00
parent 0fba21a6ac
commit aab41cfa16
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
plugins/libkolab/lib/kolab_format_event.php
View file

@ -106,7 +106,7 @@ class kolab_format_event extends kolab_format_xcal
$vexceptions = new vectorevent;
foreach ($object['exceptions'] as $i => $exception) {
$exevent = new kolab_format_event;
$exevent->set(($compacted = $this->compact_exception($exception, $object))); // only save differing values
$exevent->set($compacted = $this->compact_exception($exception, $object)); // only save differing values
// get value for recurrence-id
$recurrence_id = null;
@ -320,11 +320,17 @@ class kolab_format_event extends kolab_format_xcal
*/
private function expand_exception($exception, $master)
{
// Note: If an exception has no attendees it means there's "no attendees
// for this occurrence", not "attendees are the same as in the event" (#5300)
$forbidden = array('exceptions', 'attendees');
$is_recurring = !empty($master['recurrence']);
foreach ($master as $prop => $value) {
if (empty($exception[$prop]) && !empty($value) && $prop != 'exceptions' && $prop[0] != '_'
&& ($is_recurring || in_array($prop, array('uid','organizer','_attachments')))) {
if (empty($exception[$prop]) && !empty($value) && $prop[0] != '_'
&& !in_array($prop, $forbidden)
&& ($is_recurring || in_array($prop, array('uid','organizer')))
) {
$exception[$prop] = $value;
if ($prop == 'recurrence') {
unset($exception[$prop]['EXCEPTIONS']);
@ -334,5 +340,4 @@ class kolab_format_event extends kolab_format_xcal
return $exception;
}
}