diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2022-03-10 12:18:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-10 12:18:40 +0100 |
| commit | e2e7427dcad78f6a5b681067185bcaea97a1cb6a (patch) | |
| tree | 55404dd6c47d93080fca791e06dfc547579eddde | |
| parent | b0db62300c3d69abd2f2536b2d27d37412388d29 (diff) | |
| parent | 684922bc714794ccb4695de093d5c56eae6da23f (diff) | |
| download | nextcloud-server-e2e7427dcad78f6a5b681067185bcaea97a1cb6a.tar.gz nextcloud-server-e2e7427dcad78f6a5b681067185bcaea97a1cb6a.zip | |
Merge pull request #31002 from nextcloud/backport/30974/stable22
[stable22] Fix: Birthday events missing after reimporting contacts
| -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); } } |