Merge pull request #31859 from max65482/fix_group_share

miaulalala · web-flow · commit 6bb0985e59d7 · 2023-02-20T11:27:00.000+01:00
Fix: Birthday calendar issue with shared calendars
diff --git a/apps/dav/lib/DAV/Sharing/Backend.php b/apps/dav/lib/DAV/Sharing/Backend.php
@@ -184,7 +184,7 @@ public function getShares(int $resourceId): array {
 				'status' => 1,
 				'readOnly' => (int) $row['access'] === self::ACCESS_READ,
 				'{http://owncloud.org/ns}principal' => (string)$row['principaluri'],
-				'{http://owncloud.org/ns}group-share' => is_null($p)
+				'{http://owncloud.org/ns}group-share' => isset($p['uri']) ? str_starts_with($p['uri'], 'principals/groups') : false
 			];
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public function getShares(int $resourceId): array {`
`184`	`184`	`'status' => 1,`
`185`	`185`	`'readOnly' => (int) $row['access'] === self::ACCESS_READ,`
`186`	`186`	`'{http://owncloud.org/ns}principal' => (string)$row['principaluri'],`
`187`		`- '{http://owncloud.org/ns}group-share' => is_null($p)`
	`187`	`+ '{http://owncloud.org/ns}group-share' => isset($p['uri']) ? str_starts_with($p['uri'], 'principals/groups') : false`
`188`	`188`	`];`
`189`	`189`	`}`
`190`	`190`