mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #27311 from nextcloud/fix/caldav-deleted-objects-uri 

Fix loading of delete caldav objet URIs
This commit is contained in:
kesselb 2021-06-01 10:10:22 +02:00 committed by GitHub
parent 943eefd66c ff2a730aac
commit 4dc8a4d8d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dav/lib/CalDAV/CalDavBackend.php
View File

@ -1112,7 +1112,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
while ($row = $stmt->fetch()) { while ($row = $stmt->fetch()) {
$result[] = [ $result[] = [
'id' => $row['id'], 'id' => $row['id'],
'uri' => $row['co.uri'], 'uri' => $row['uri'],
'lastmodified' => $row['lastmodified'], 'lastmodified' => $row['lastmodified'],
'etag' => '"' . $row['etag'] . '"', 'etag' => '"' . $row['etag'] . '"',
'calendarid' => $row['calendarid'], 'calendarid' => $row['calendarid'],
@ -2156,7 +2156,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
return [ return [
'id' => $row['id'], 'id' => $row['id'],
'uri' => $row['c.uri'], 'uri' => $row['uri'],
'lastmodified' => $row['lastmodified'], 'lastmodified' => $row['lastmodified'],
'etag' => '"' . $row['etag'] . '"', 'etag' => '"' . $row['etag'] . '"',
'calendarid' => $row['calendarid'], 'calendarid' => $row['calendarid'],