summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2015-02-26 17:43:38 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2015-02-26 17:43:38 (GMT)
commit2e8eb8596fcf1729441e8301f1977f394cc56bab (patch)
tree79878f3401ddcb7b3a553d6c5ce20520aea8897d /plugins
parent1bcc7a48ef5359261309e2413543be4ae0500a3b (diff)
downloadroundcubemail-plugins-kolab-2e8eb8596fcf1729441e8301f1977f394cc56bab.tar.gz
Don't set recurrence_date for master event (#4738)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/libcalendaring/libcalendaring.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/libcalendaring/libcalendaring.php b/plugins/libcalendaring/libcalendaring.php
index 2d9c3cc..f215ce6 100644
--- a/plugins/libcalendaring/libcalendaring.php
+++ b/plugins/libcalendaring/libcalendaring.php
@@ -1420,7 +1420,7 @@ class libcalendaring extends rcube_plugin
$object['_instance'] = $object['recurrence_date']->format($recurrence_id_format);
$object['_savemode'] = $object['thisandfuture'] ? 'future' : 'current';
}
- else if (!empty($object['recurrence_id']) || !empty($object['_instance'])) {
+ else if (!empty($object['recurrence_id']) && !empty($object['_instance'])) {
if (strlen($object['_instance']) > 4) {
$object['recurrence_date'] = rcube_utils::anytodatetime($object['_instance'], $object['start']->getTimezone());
}