diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2022-06-01 17:01:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-01 17:01:58 +0200 |
| commit | 4e5ed32025398e006f40e819428270d209994e03 (patch) | |
| tree | b409848e430879ec1c0cd95ac32b303fc1800549 /apps/dav/lib | |
| parent | b1c793e6632b26b6c7e12c5f24b03a5b77482e69 (diff) | |
| parent | cf8b98bf5f1da01a5992bd88ea4a8ed83e797eba (diff) | |
| download | nextcloud-server-4e5ed32025398e006f40e819428270d209994e03.tar.gz nextcloud-server-4e5ed32025398e006f40e819428270d209994e03.zip | |
Merge pull request #32471 from nextcloud/fix-wrong-dav-activities
Make sure activities are not created when a deleted calendar object expires
Diffstat (limited to 'apps/dav/lib')
| -rw-r--r-- | apps/dav/lib/CalDAV/CalDavBackend.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php index 3253d41a5cd..8bdc084cd7b 100644 --- a/apps/dav/lib/CalDAV/CalDavBackend.php +++ b/apps/dav/lib/CalDAV/CalDavBackend.php @@ -1139,7 +1139,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription */ public function getCalendarObject($calendarId, $objectUri, int $calendarType = self::CALENDAR_TYPE_CALENDAR) { $query = $this->db->getQueryBuilder(); - $query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification']) + $query->select(['id', 'uri', 'lastmodified', 'etag', 'calendarid', 'size', 'calendardata', 'componenttype', 'classification', 'deleted_at']) ->from('calendarobjects') ->where($query->expr()->eq('calendarid', $query->createNamedParameter($calendarId))) ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($objectUri))) @@ -1161,7 +1161,8 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription 'size' => (int)$row['size'], 'calendardata' => $this->readBlob($row['calendardata']), 'component' => strtolower($row['componenttype']), - 'classification' => (int)$row['classification'] + 'classification' => (int)$row['classification'], + '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}deleted-at' => $row['deleted_at'] === null ? $row['deleted_at'] : (int) $row['deleted_at'], ]; } |