Skip to content

[stable19] set the display name of federated sharees from addressbook #24354

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
rullzer merged 2 commits into from
Nov 25, 2020
Merged

[stable19] set the display name of federated sharees from addressbook #24354

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10a252c
set the display name of federated sharees from addressbook
blizzz Nov 16, 2020
29a452c
send expected format of cloud id
blizzz Nov 24, 2020
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
Prev Previous commit
send expected format of cloud id 
Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz
blizzz committed Nov 25, 2020
commit 29a452c6932a84bd6ffadc66332bb891ca78e535
3 changes: 2 additions & 1 deletion lib/private/Federation/CloudIdManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ public function getCloudId(string $user, string $remote): ICloudId {
$host = $fixedRemote;
}
$id = $user . '@' . $remote;
return new CloudId($id, $user, $fixedRemote, $this->getDisplayNameFromContact($id));
$displayName = $this->getDisplayNameFromContact($user . '@' . $host);
return new CloudId($id, $user, $fixedRemote, $displayName);
}

/**
Expand Down