From 6a5a8148348d0eddb452ff33affe4af87e9359cc Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Mon, 16 Feb 2015 15:59:50 +0100 Subject: [PATCH] Don't remove properties from exceptions which are equal to the master event. KE17 says: A recurrence exception SHALL copy ALL properties of the base event, and adjust as required, and it SHALL NOT be applied on top of the orginial event properties (The exception replaces the complete original event definition for the specific occurrence). --- plugins/libkolab/lib/kolab_format_event.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/plugins/libkolab/lib/kolab_format_event.php b/plugins/libkolab/lib/kolab_format_event.php index 0fda1e39..979b33b4 100644 --- a/plugins/libkolab/lib/kolab_format_event.php +++ b/plugins/libkolab/lib/kolab_format_event.php @@ -241,7 +241,6 @@ class kolab_format_event extends kolab_format_xcal private function compact_exception($exception, $master) { $forbidden = array('recurrence','organizer','_attachments'); - $whitelist = array('start','end'); foreach ($forbidden as $prop) { if (array_key_exists($prop, $exception)) { @@ -249,12 +248,6 @@ class kolab_format_event extends kolab_format_xcal } } - foreach ($master as $prop => $value) { - if (isset($exception[$prop]) && gettype($exception[$prop]) == gettype($value) && $exception[$prop] == $value && !in_array($prop, $whitelist)) { - unset($exception[$prop]); - } - } - // preserve this property for date serialization $exception['allday'] = $master['allday'];