From 2e8eb8596fcf1729441e8301f1977f394cc56bab Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Thu, 26 Feb 2015 18:43:38 +0100
Subject: [PATCH] Don't set recurrence_date for master event (#4738)

---
 plugins/libcalendaring/libcalendaring.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/libcalendaring/libcalendaring.php b/plugins/libcalendaring/libcalendaring.php
index 2d9c3cc7..f215ce68 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());
             }