Correctly handle recurrence exceptions in calendar/replace method.

Bug: 13399
horde · Jul 29, 2014 · ffbfd88 · ffbfd88
1 parent cdaf2b6
commit ffbfd88
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/kronolith/lib/Api.php b/kronolith/lib/Api.php
@@ -1118,11 +1118,16 @@ public function replace($uid, $content, $contentType, $calendar = null)
             }
         }
 
-        $event->fromiCalendar($component);
-        // Ensure we keep the original UID, even when content does not
-        // contain one and fromiCalendar creates a new one.
-        $event->uid = $uid;
-        $event->save();
+        try {
+            $rid = $component->getAttribute('RECURRENCE-ID');
+            $this->_addiCalEvent($component, Kronolith::getDriver(null, $calendar), true);
+        } catch (Horde_Icalendar_Exception $e) {
+            $event->fromiCalendar($component);
+            // Ensure we keep the original UID, even when content does not
+            // contain one and fromiCalendar creates a new one.
+            $event->uid = $uid;
+            $event->save();
+        }
     }
 
     /**