diff --git a/src/Plugin/views/style/FullCalendar.php b/src/Plugin/views/style/FullCalendar.php index 9386c99..e10f433 100644 --- a/src/Plugin/views/style/FullCalendar.php +++ b/src/Plugin/views/style/FullCalendar.php @@ -444,21 +444,12 @@ class FullCalendar extends StylePluginBase { /** @var \Drupal\date_recur\Plugin\Field\FieldType\DateRecurItem $item */ foreach ($field_items as $index => $item) { - // Get DateRecur Occurrence Handler. - $occurrenceHandler = $item->getOccurrenceHandler(); - - // If this field is a DateRecur field. - if ($occurrenceHandler->isRecurring()) { - // Get a list of occurrences for display. - $occurrences = $occurrenceHandler->getOccurrencesForDisplay($date_range['min'], $date_range['max']); + if ($item->isRecurring()) { + /** @var \Drupal\date_recur\DateRange[] $occurrences */ + $occurrences = $item->getHelper()->getOccurrences(); foreach ($occurrences as $occurrence) { - /** @var \DateTime $start */ - $start = $occurrence['value']; - /** @var \DateTime $end */ - $end = $occurrence['end_value']; - - $event = $this->prepareEvent($entity, $field, $index, $start, $end); + $event[] = $this->prepareEvent($entity, $field, $index, $occurrence->getStart(), $occurrence->getEnd()); } $isRecurring = TRUE; @@ -510,7 +501,7 @@ class FullCalendar extends StylePluginBase { } if (!empty($event)) { - $events[$delta] = $event; + $events = array_merge($events, $event); } }