upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-25 03:43:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 39

Merge pull request #30064 from nextcloud/backport/30046/stable21

Browse source
This commit is contained in:
John Molakvoæ 2021-12-03 09:03:21 +01:00 committed by GitHub
commit 2efd975380
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/dav/lib/CalDAV/CalDavBackend.php
View file

@ -1656,6 +1656,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$result = $outerQuery->execute();
$calendarObjects = $result->fetchAll();
$result->closeCursor();
return array_map(function ($o) {
$calendarData = Reader::read($o['calendardata']);
@ -2315,6 +2316,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
'size' => (int)$row['size'],
];
}
$stmt->closeCursor();
return $result;
}
@ -2695,6 +2697,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
->execute();
$ids = $result->fetchAll();
$result->closeCursor();
foreach ($ids as $id) {
$this->deleteCalendar($id['id']);
}