Merge pull request #53371 from nextcloud/revert-53077-backport/52914/stable31

skjnldsv · web-flow · commit 27dcaa512b60 · 2025-06-06T12:38:31.000+02:00
diff --git a/apps/dav/lib/DAV/GroupPrincipalBackend.php b/apps/dav/lib/DAV/GroupPrincipalBackend.php
@@ -50,10 +50,8 @@ public function getPrincipalsByPrefix($prefixPath) {
 		$principals = [];
 
 		if ($prefixPath === self::PRINCIPAL_PREFIX) {
-			foreach ($this->groupManager->search('') as $group) {
-				if (!$group->hideFromCollaboration()) {
-					$principals[] = $this->groupToPrincipal($group);
-				}
+			foreach ($this->groupManager->search('') as $user) {
+				$principals[] = $this->groupToPrincipal($user);
 			}
 		}
 
@@ -79,7 +77,7 @@ public function getPrincipalByPath($path) {
 		$name = urldecode($elements[2]);
 		$group = $this->groupManager->get($name);
 
-		if ($group !== null && !$group->hideFromCollaboration()) {
+		if (!is_null($group)) {
 			return $this->groupToPrincipal($group);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,8 @@ public function getPrincipalsByPrefix($prefixPath) {`
`50`	`50`	`$principals = [];`
`51`	`51`
`52`	`52`	`if ($prefixPath === self::PRINCIPAL_PREFIX) {`
`53`		`- foreach ($this->groupManager->search('') as $group) {`
`54`		`- if (!$group->hideFromCollaboration()) {`
`55`		`- $principals[] = $this->groupToPrincipal($group);`
`56`		`- }`
	`53`	`+ foreach ($this->groupManager->search('') as $user) {`
	`54`	`+ $principals[] = $this->groupToPrincipal($user);`
`57`	`55`	`}`
`58`	`56`	`}`
`59`	`57`
`@@ -79,7 +77,7 @@ public function getPrincipalByPath($path) {`
`79`	`77`	`$name = urldecode($elements[2]);`
`80`	`78`	`$group = $this->groupManager->get($name);`
`81`	`79`
`82`		`- if ($group !== null && !$group->hideFromCollaboration()) {`
	`80`	`+ if (!is_null($group)) {`
`83`	`81`	`return $this->groupToPrincipal($group);`
`84`	`82`	`}`
`85`	`83`