fixup! fix(caldav): event search with limit and timerange

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
nextcloud · May 8, 2024 · ab8f6cf · ab8f6cf
1 parent 9986aaf
commit ab8f6cf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -1991,12 +1991,12 @@ public function search(
 			$outerQuery->setMaxResults($maxResults);
 
 			for ($attempt = $objectsCount = 0; $attempt < 3 && $objectsCount < $limit; $attempt++) {
-				$objectsCount = array_push($calendarObjects, ...$this->searchCalendarObjectsByQuery($outerQuery, $start, $end));
+				$objectsCount = array_push($calendarObjects, ...$this->searchCalendarObjects($outerQuery, $start, $end));
 				$outerQuery->setFirstResult($offset += $maxResults);
 			}
 		} else {
 			$outerQuery->setMaxResults($limit);
-			$calendarObjects = $this->searchCalendarObjectsByQuery($outerQuery, $start, $end);
+			$calendarObjects = $this->searchCalendarObjects($outerQuery, $start, $end);
 		}
 
 		return array_map(function ($o) use ($options) {
@@ -2037,7 +2037,7 @@ public function search(
 		}, $calendarObjects);
 	}
 
-	private function searchCalendarObjectsByQuery(IQueryBuilder $query, DateTimeInterface|null $start, DateTimeInterface|null $end): array {
+	private function searchCalendarObjects(IQueryBuilder $query, DateTimeInterface|null $start, DateTimeInterface|null $end): array {
 		$calendarObjects = [];
 		$filterByTimeRange = ($start instanceof DateTimeInterface) || ($end instanceof DateTimeInterface);