Merge pull request #59299 from AlessioDiPretoroAsdea/fix/suggestion-ticket-59266

nickvergessen · web-flow · commit 820e0915e9c0 · 2026-03-31T13:30:14.000+02:00
dav: Fix fatal error when ORGANIZER is missing in CalDAV schedule
diff --git a/apps/dav/lib/CalDAV/Schedule/Plugin.php b/apps/dav/lib/CalDAV/Schedule/Plugin.php
@@ -765,7 +765,7 @@ private function handleSameOrganizerException(
 
 		$addresses = $this->getAddressesForPrincipal($calendarNode->getOwner());
 		foreach ($vCal->VEVENT as $vevent) {
-			if (in_array($vevent->ORGANIZER->getNormalizedValue(), $addresses, true)) {
+			if (isset($vevent->ORGANIZER) && in_array($vevent->ORGANIZER->getNormalizedValue(), $addresses, true)) {
 				// User is an organizer => throw the exception
 				throw $e;
 			}

Original file line number	Diff line number	Diff line change
`@@ -765,7 +765,7 @@ private function handleSameOrganizerException(`
`765`	`765`
`766`	`766`	`$addresses = $this->getAddressesForPrincipal($calendarNode->getOwner());`
`767`	`767`	`foreach ($vCal->VEVENT as $vevent) {`
`768`		`- if (in_array($vevent->ORGANIZER->getNormalizedValue(), $addresses, true)) {`
	`768`	`+ if (isset($vevent->ORGANIZER) && in_array($vevent->ORGANIZER->getNormalizedValue(), $addresses, true)) {`
`769`	`769`	`// User is an organizer => throw the exception`
`770`	`770`	`throw $e;`
`771`	`771`	`}`