summaryrefslogtreecommitdiff
path: root/plugins/libkolab
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2015-02-16 14:59:50 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2015-02-16 14:59:50 (GMT)
commit6a5a8148348d0eddb452ff33affe4af87e9359cc (patch)
treeaedd0c468395bab91b7d50abd983b8dc030d5398 /plugins/libkolab
parentfe64e05e48c11b809bde1a32161dcdce3e1e2ea3 (diff)
downloadroundcubemail-plugins-kolab-6a5a8148348d0eddb452ff33affe4af87e9359cc.tar.gz
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).
Diffstat (limited to 'plugins/libkolab')
-rw-r--r--plugins/libkolab/lib/kolab_format_event.php7
1 files changed, 0 insertions, 7 deletions
diff --git a/plugins/libkolab/lib/kolab_format_event.php b/plugins/libkolab/lib/kolab_format_event.php
index 0fda1e3..979b33b 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'];