diff options
| author | Maximilian Martin <maximilian_martin@gmx.de> | 2022-02-02 09:19:03 -0500 |
|---|---|---|
| committer | MichaIng (Rebase PR Action) <micha@dietpi.com> | 2022-02-22 23:18:23 +0000 |
| commit | 6596c836b7aa00fda5869ff45282cb89a564f48e (patch) | |
| tree | 7c644f0b2ccae9d3d7404d40bdf5ef8f2c0a1aab | |
| parent | edfa6033b99338d4f18cfdfaa3d1e2b14691d638 (diff) | |
| download | nextcloud-server-6596c836b7aa00fda5869ff45282cb89a564f48e.tar.gz nextcloud-server-6596c836b7aa00fda5869ff45282cb89a564f48e.zip | |
delete birthday calendar events permanently
Signed-off-by: Maximilian Martin <maximilian_martin@gmx.de>
| -rw-r--r-- | apps/dav/lib/CalDAV/BirthdayService.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/dav/lib/CalDAV/BirthdayService.php b/apps/dav/lib/CalDAV/BirthdayService.php index 3f73ca7a1dc..bdcf0796283 100644 --- a/apps/dav/lib/CalDAV/BirthdayService.php +++ b/apps/dav/lib/CalDAV/BirthdayService.php @@ -150,7 +150,7 @@ class BirthdayService { $calendar = $this->ensureCalendarExists($principalUri); foreach (['', '-death', '-anniversary'] as $tag) { $objectUri = $book['uri'] . '-' . $cardUri . $tag .'.ics'; - $this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri); + $this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri, CalDavBackend::CALENDAR_TYPE_CALENDAR, true); } } } @@ -306,7 +306,7 @@ class BirthdayService { $calendarObjects = $this->calDavBackEnd->getCalendarObjects($calendar['id'], CalDavBackend::CALENDAR_TYPE_CALENDAR); foreach ($calendarObjects as $calendarObject) { - $this->calDavBackEnd->deleteCalendarObject($calendar['id'], $calendarObject['uri'], CalDavBackend::CALENDAR_TYPE_CALENDAR); + $this->calDavBackEnd->deleteCalendarObject($calendar['id'], $calendarObject['uri'], CalDavBackend::CALENDAR_TYPE_CALENDAR, true); } } @@ -384,7 +384,7 @@ class BirthdayService { $existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri); if ($calendarData === null) { if ($existing !== null) { - $this->calDavBackEnd->deleteCalendarObject($calendarId, $objectUri); + $this->calDavBackEnd->deleteCalendarObject($calendarId, $objectUri, CalDavBackend::CALENDAR_TYPE_CALENDAR, true); } } else { if ($existing === null) { @@ -398,7 +398,7 @@ class BirthdayService { if ($existing2path !== null && array_key_exists('uri', $calendarInfo)) { // delete the old birthday entry first so that we do not get duplicate UIDs $existing2objectUri = substr($existing2path, strlen($calendarInfo['uri']) + 1); - $this->calDavBackEnd->deleteCalendarObject($calendarId, $existing2objectUri); + $this->calDavBackEnd->deleteCalendarObject($calendarId, $existing2objectUri, CalDavBackend::CALENDAR_TYPE_CALENDAR, true); } } |