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

pull/30082/head
John Molakvoæ 4 years ago committed by GitHub
commit 2efd975380
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      apps/dav/lib/CalDAV/CalDavBackend.php

@ -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']);
}

Loading…
Cancel
Save