Merge pull request #1959 from nextcloud/backport/1927/stable29

ArtificialOwl · web-flow · commit 292108b1a605 · 2025-04-07T10:38:17.000-01:00
[stable29] do not refresh display name on known local user
diff --git a/lib/Service/FederatedUserService.php b/lib/Service/FederatedUserService.php
@@ -998,7 +998,9 @@ private function fillSingleCircleId(FederatedUser $federatedUser, bool $generate
 
 		$circle = $this->getSingleCircle($federatedUser, $generate);
 		$federatedUser->setSingleId($circle->getSingleId());
-		$federatedUser->setDisplayName($circle->getDisplayName());
+		if ($federatedUser->getUserType() !== Member::TYPE_USER || $federatedUser->getDisplayName() === '') {
+			$federatedUser->setDisplayName($circle->getDisplayName());
+		}
 		$federatedUser->setBasedOn($circle);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -998,7 +998,9 @@ private function fillSingleCircleId(FederatedUser $federatedUser, bool $generate`
`998`	`998`
`999`	`999`	`$circle = $this->getSingleCircle($federatedUser, $generate);`
`1000`	`1000`	`$federatedUser->setSingleId($circle->getSingleId());`
`1001`		`- $federatedUser->setDisplayName($circle->getDisplayName());`
	`1001`	`+ if ($federatedUser->getUserType() !== Member::TYPE_USER \|\| $federatedUser->getDisplayName() === '') {`
	`1002`	`+ $federatedUser->setDisplayName($circle->getDisplayName());`
	`1003`	`+ }`
`1002`	`1004`	`$federatedUser->setBasedOn($circle);`
`1003`	`1005`	`}`
`1004`	`1006`