diff options
| author | Simon L <szaimen@e.mail.de> | 2022-02-04 00:16:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-04 00:16:25 +0100 |
| commit | 772b3d38f33d95dc185bcd0d04cb6e5e78ad0aa9 (patch) | |
| tree | 1c64e917ac34461a14783dded7d5e278f0dfec7a | |
| parent | f2cd30df8dd4e399ed86d4efcbd583fb91ca3f18 (diff) | |
| parent | 33c698872b0a8563d488188fad0d533d10a1db81 (diff) | |
| download | nextcloud-server-772b3d38f33d95dc185bcd0d04cb6e5e78ad0aa9.tar.gz nextcloud-server-772b3d38f33d95dc185bcd0d04cb6e5e78ad0aa9.zip | |
Merge pull request #30974 from max65482/fix_bday_cal_update_issue
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); } } |