Branch 'roundcubemail-plugins-kolab-3.0' - plugins/libkolab

[Thomas Brüderli]

 plugins/libkolab/lib/kolab_format_xcal.php |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 873516681fde288c7a27743174ed4af39ae38a66
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Jul 4 16:58:18 2013 +0200

    Fix saving objects without recurrence rule (but previously had recurrence)

diff --git a/plugins/libkolab/lib/kolab_format_xcal.php b/plugins/libkolab/lib/kolab_format_xcal.php
index e9a28e1..db817ff 100644
--- a/plugins/libkolab/lib/kolab_format_xcal.php
+++ b/plugins/libkolab/lib/kolab_format_xcal.php
@@ -271,8 +271,10 @@ abstract class kolab_format_xcal extends kolab_format
         }
 
         // save recurrence rule
+        $rr = new RecurrenceRule;
+        $rr->setFrequency(RecurrenceRule::FreqNone);
+
         if ($object['recurrence']) {
-            $rr = new RecurrenceRule;
             $rr->setFrequency($this->rrule_type_map[$object['recurrence']['FREQ']]);
 
             if ($object['recurrence']['INTERVAL'])
@@ -312,8 +314,6 @@ abstract class kolab_format_xcal extends kolab_format
                 $rr->setEnd(self::get_datetime($object['recurrence']['UNTIL'], null, true));
 
             if ($rr->isValid()) {
-                $this->obj->setRecurrenceRule($rr);
-
                 // add exception dates (only if recurrence rule is valid)
                 $exdates = new vectordatetime;
                 foreach ((array)$object['recurrence']['EXDATE'] as $exdate)
@@ -329,6 +329,8 @@ abstract class kolab_format_xcal extends kolab_format
             }
         }
 
+        $this->obj->setRecurrenceRule($rr);
+
         // save alarm
         $valarms = new vectoralarm;
         if ($object['alarms']) {