Merge pull request #58199 from nextcloud/backport/58197/stable32

Altahrim · web-flow · commit 77a8f7ba1b61 · 2026-03-20T15:57:04.000+01:00
diff --git a/apps/dav/lib/CalDAV/CalendarProvider.php b/apps/dav/lib/CalDAV/CalendarProvider.php
@@ -67,7 +67,7 @@ public function getCalendars(string $principalUri, array $calendarUris = []): ar
 			$user = str_replace('principals/users/', '', $calendarInfo['principaluri']);
 			$path = 'calendars/' . $user . '/' . $calendarInfo['uri'];
 			if (isset($additionalFederatedProps[$path])) {
-				$calendarInfo = array_merge($calendarInfo, $additionalProperties[$path]);
+				$calendarInfo = array_merge($calendarInfo, $additionalFederatedProps[$path]);
 			}
 
 			$iCalendars[] = new FederatedCalendarImpl($calendarInfo, $this->calDavBackend);

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function getCalendars(string $principalUri, array $calendarUris = []): ar`
`67`	`67`	`$user = str_replace('principals/users/', '', $calendarInfo['principaluri']);`
`68`	`68`	`$path = 'calendars/' . $user . '/' . $calendarInfo['uri'];`
`69`	`69`	`if (isset($additionalFederatedProps[$path])) {`
`70`		`- $calendarInfo = array_merge($calendarInfo, $additionalProperties[$path]);`
	`70`	`+ $calendarInfo = array_merge($calendarInfo, $additionalFederatedProps[$path]);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`$iCalendars[] = new FederatedCalendarImpl($calendarInfo, $this->calDavBackend);`