plugins/libcalendaring

Thomas Brüderli bruederli at kolabsys.com
Thu Feb 26 18:44:06 CET 2015


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

New commits:
commit 2e8eb8596fcf1729441e8301f1977f394cc56bab
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Feb 26 18:43:38 2015 +0100

    Don't set recurrence_date for master event (#4738)

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());
             }




More information about the commits mailing list