D25060.1734918576.diff
No OneTemporary
Actions

Size

934 B

Referenced Files

None

Subscribers

None

D25060.1734918576.diff
View Options

	diff --git a/src/applications/calendar/query/PhabricatorCalendarEventQuery.php b/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
	--- a/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
	+++ b/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
	@@ -222,12 +222,16 @@

	$limit = $this->getRecurrenceLimit($event, $raw_limit);

	+ // note that this can be NULL for some imported events
	$set = $event->newRecurrenceSet();

	- $recurrences = $set->getEventsBetween(
	- $start_date,
	- $end_date,
	- $limit + 1);
	+ $recurrences = [];
	+ if ($set) {
	+ $recurrences = $set->getEventsBetween(
	+ $start_date,
	+ $end_date,
	+ $limit + 1);
	+ }

	// We're generating events from the beginning and then filtering them
	// here (instead of only generating events starting at the start date)