Skip to content

Commit 657bffe

Browse files
chore(dav): tidy getCalendarObjectByUID for logical clarity
Signed-off-by: Josh <josh.t.richards@gmail.com>
1 parent 7ee1f8b commit 657bffe

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

apps/dav/lib/CalDAV/CalDavBackend.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2670,13 +2670,14 @@ public function getCalendarObjectByUID($principalUri, $uid, $calendarUri = null)
26702670
->andWhere($query->expr()->eq('co.uid', $query->createNamedParameter($uid)))
26712671
->andWhere($query->expr()->eq('co.calendartype', $query->createNamedParameter(self::CALENDAR_TYPE_CALENDAR)))
26722672
->andWhere($query->expr()->isNull('co.deleted_at'))
2673-
->andWhere($query->expr()->isNull('c.deleted_at'))
2674-
->setMaxResults(1);
2673+
->andWhere($query->expr()->isNull('c.deleted_at'));
26752674

26762675
if ($calendarUri !== null) {
26772676
$query->andWhere($query->expr()->eq('c.uri', $query->createNamedParameter($calendarUri)));
26782677
}
26792678

2679+
$query->->setMaxResults(1);
2680+
26802681
$stmt = $query->executeQuery();
26812682
$row = $stmt->fetchAssociative();
26822683
$stmt->closeCursor();

0 commit comments

Comments
 (0)