More EAS 16 exception handling fixes.

horde · Feb 3, 2016 · 8408bea · 8408bea
1 parent 4d2ed7d
commit 8408bea
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php
@@ -1746,7 +1746,19 @@ public function fromASAppointment(Horde_ActiveSync_Message_Appointment $message)
              * to delete all existing exceptions and re-create them. The only
              * drawback to this is that the UIDs will change. */
             $kronolith_driver = $this->getDriver();
-            $this->recurrence = $rrule;
+
+            // EAS 16 doesn't update exception data on edits of the base event
+            // but still sends the recurrence rule. We need to replace the
+            // recurrence rule if it changed (and overwrite any exceptions),
+            // otherwise leave it alone.
+            if ($message->getProtocolVersion() >= Horde_ActiveSync::VERSION_SIXTEEN) {
+                if (!empty($this->uid) &&
+                    !empty($this->recurrence) &&
+                    !$this->recurrence->isEqual($rrule)) {
+                    $this->disconnectExceptions(true);
+                    $this->recurrence = $rrule;
+                }
+            }
 
             if (!empty($this->uid) &&
                 $message->getProtocolVersion() < Horde_ActiveSync::VERSION_SIXTEEN) {