From ad8677078007de25d3e81508c3a11990ec23fdce Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Thu, 4 Jul 2013 16:58:18 +0200
Subject: [PATCH] Fix saving objects without recurrence rule (but previously
 had recurrence)

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

diff --git a/plugins/libkolab/lib/kolab_format_xcal.php b/plugins/libkolab/lib/kolab_format_xcal.php
index 24f8237f..ff10a100 100644
--- a/plugins/libkolab/lib/kolab_format_xcal.php
+++ b/plugins/libkolab/lib/kolab_format_xcal.php
@@ -286,8 +286,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'])
@@ -327,8 +329,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)
@@ -344,6 +344,8 @@ abstract class kolab_format_xcal extends kolab_format
             }
         }
 
+        $this->obj->setRecurrenceRule($rr);
+
         // save alarm
         $valarms = new vectoralarm;
         if ($object['alarms']) {