Branch 'roundcubemail-plugins-kolab-3.1' - plugins/libcalendaring

Thomas Brüderli bruederli at kolabsys.com
Thu Feb 6 10:56:40 CET 2014


 plugins/libcalendaring/libvcalendar.php |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ca5e0b608104a03a204b919a594a4a14815832b0
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Thu Feb 6 10:54:57 2014 +0100

    Add fallback to find VEVENT blocks with RECURRENCE-ID (#2792)

diff --git a/plugins/libcalendaring/libvcalendar.php b/plugins/libcalendaring/libvcalendar.php
index f16a64d..b179a9e 100644
--- a/plugins/libcalendaring/libvcalendar.php
+++ b/plugins/libcalendaring/libvcalendar.php
@@ -292,7 +292,7 @@ class libvcalendar implements Iterator
             $this->method = strval($vobject->METHOD);
             $this->agent  = strval($vobject->PRODID);
 
-            foreach ($vobject->getBaseComponents() as $ve) {
+            foreach ($vobject->getBaseComponents() ?: $vobject->getComponents() as $ve) {
                 if ($ve->name == 'VEVENT' || $ve->name == 'VTODO') {
                     // convert to hash array representation
                     $object = $this->_to_array($ve);
@@ -424,7 +424,7 @@ class libvcalendar implements Iterator
                 break;
 
             case 'RECURRENCE-ID':
-                // $event['recurrence_id'] = self::convert_datetime($prop);
+                $event['recurrence_date'] = self::convert_datetime($prop);
                 break;
 
             case 'RELATED-TO':




More information about the commits mailing list