Merge branch '2.0RC'

1 files changed, 8 insertions, 4 deletions

diff --git a/vendor/sabre/vobject/lib/Recur/EventIterator.php b/vendor/sabre/vobject/lib/Recur/EventIterator.php
index 86c996aec..f91c336bc 100644
--- a/vendor/sabre/vobject/lib/Recur/EventIterator.php
+++ b/vendor/sabre/vobject/lib/Recur/EventIterator.php
@@ -325,7 +325,7 @@ class EventIterator implements \Iterator {
         $index = [];
         foreach ($this->overriddenEvents as $key => $event) {
             $stamp = $event->DTSTART->getDateTime($this->timeZone)->getTimeStamp();
-            $index[$stamp] = $key;
+            $index[$stamp][] = $key;
         }
         krsort($index);
         $this->counter = 0;
@@ -372,8 +372,9 @@ class EventIterator implements \Iterator {
         // overridden event may cut ahead.
         if ($this->overriddenEventsIndex) {
 
-            $offset = end($this->overriddenEventsIndex);
+            $offsets = end($this->overriddenEventsIndex);
             $timestamp = key($this->overriddenEventsIndex);
+            $offset = end($offsets);
             if (!$nextDate || $timestamp < $nextDate->getTimeStamp()) {
                 // Overridden event comes first.
                 $this->currentOverriddenEvent = $this->overriddenEvents[$offset];
@@ -383,7 +384,10 @@ class EventIterator implements \Iterator {
                 $this->currentDate = $this->currentOverriddenEvent->DTSTART->getDateTime($this->timeZone);
 
                 // Ensuring that this item will only be used once.
-                array_pop($this->overriddenEventsIndex);
+                array_pop($this->overriddenEventsIndex[$timestamp]);
+                if (!$this->overriddenEventsIndex[$timestamp]) {
+                    array_pop($this->overriddenEventsIndex);
+                }
 
                 // Exit point!
                 return;
@@ -451,7 +455,7 @@ class EventIterator implements \Iterator {
     /**
      * Overridden event index.
      *
-     * Key is timestamp, value is the index of the item in the $overriddenEvent
+     * Key is timestamp, value is the list of indexes of the item in the $overriddenEvent
      * property.
      *
      * @var array