fixup! WIP: fix Calendar Trashbin

nextcloud · Feb 7, 2023 · ce7e021 · ce7e021
1 parent afe0cf8
commit ce7e021
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -1235,8 +1235,9 @@ public function createCalendarObject($calendarId, $objectUri, $calendarData, $ca
 		if ($found !== false) {
 			// when importing a calendar obejct already previously imported
 			// we first restore it and then update the event to the new data
-			$this->restoreCalendarObject($result['calendardata']);
-			return $this->updateCalendarObject($calendarId, $found['uri'], $calendarData, $calendarType);
+			$this->restoreCalendarObject($found);
+			$restoreUri = str_replace('-deleted.ics', '.ics', $found['uri']);
+			return $this->updateCalendarObject($calendarId, $restoreUri, $calendarData, $calendarType);
 		}
 
 		$query = $this->db->getQueryBuilder();