Skip to content

[stable31] do not refresh display name on known local user #1957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArtificialOwl merged 1 commit into from
Apr 7, 2025
Merged

[stable31] do not refresh display name on known local user #1957

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
do not refresh display name on known local user 
Signed-off-by: Maxence Lange <[email protected]>
  • Loading branch information
@ArtificialOwl @backportbot
ArtificialOwl authored and backportbot[bot] committed Apr 7, 2025
commit fa7a868e172f8c164258bffa7928124a293fef64
4 changes: 3 additions & 1 deletion lib/Service/FederatedUserService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,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);
}

Expand Down
Loading