[jan] Handle gracefully if the base event of an imported recurrence e…

…xception is no longer recurring (Bug #14249).
horde · Feb 12, 2016 · e142cdc · e142cdc
1 parent f878461
commit e142cdc
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 7 deletions.
diff --git a/kronolith/docs/CHANGES b/kronolith/docs/CHANGES
@@ -28,6 +28,22 @@ v4.3.0-git
 [jan] Add importing of calendar data from a URL.
 
 
+-------
+v4.2.14
+-------
+
+[mjr] Fix issue deleting and closing event dialog during event deletion.
+[mjr] Honor the SCHEDULE-AGENT attribute during CalDAV import.
+
+
+-------
+v4.2.13
+-------
+
+[mjr] Add missing EAS ghosted property support for all EAS versions. Prevents
+      potential loss of event data during synchronization.
+
+
 -------
 v4.2.12
 -------

diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php
@@ -1467,12 +1467,14 @@ protected function _handlevEventRecurrence($vEvent)
             $this->uid = null;
             try {
                 $originalEvent = $this->getDriver()->getByUID($this->baseid);
-                $originalEvent->recurrence->addException(
-                    $originaldt->format('Y'),
-                    $originaldt->format('m'),
-                    $originaldt->format('d')
-                );
-                $originalEvent->save();
+                if ($originalEvent->recurrence) {
+                    $originalEvent->recurrence->addException(
+                        $originaldt->format('Y'),
+                        $originaldt->format('m'),
+                        $originaldt->format('d')
+                    );
+                    $originalEvent->save();
+                }
             } catch (Horde_Exception_NotFound $e) {
                 throw new Kronolith_Exception(_("Unable to locate original event series."));
             }

diff --git a/kronolith/package.xml b/kronolith/package.xml
@@ -2663,9 +2663,10 @@
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2015-10-21</date>
+   <date>2016-02-02</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [mjr] Fix missing truncated event description when using ActiveSync.
 * [jan] Fix week number in basic view if week starts on Sundays.
 * [mjr] Fix issue where new event could be created with exceptions from previously edited event.
 * [jan] Mark preferences only available in basic mode.
@@ -2677,6 +2678,46 @@
 * [mjr] Fix display of embed code by adding the full url.
    </notes>
   </release>
+  <release>
+   <version>
+    <release>4.2.13</release>
+    <api>4.2.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2016-02-04</date>
+   <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
+   <notes>
+* [mjr] Add missing EAS ghosted property support for all EAS versions. Prevents potential loss of event data during synchronization.
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>4.2.14</release>
+    <api>4.2.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2016-02-11</date>
+   <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
+   <notes>
+* [mjr] Fix issue deleting and closing event dialog during event deletion.
+* [mjr] Honor the SCHEDULE-AGENT attribute during CalDAV import.
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>4.2.15</release>
+    <api>4.2.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2016-02-10</date>
+   <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
+   <notes>
+* [jan] Handle gracefully if the base event of an imported recurrence exception is no longer recurring (Bug #14249).
+   </notes>
+  </release>
   <release>
    <version>
     <release>4.3.0</release>