aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2020-12-15 14:35:50 +0100
committerGitHub <noreply@github.com>2020-12-15 14:35:50 +0100
commitd37034f1612279b07c78284771ac73fbd5a2a407 (patch)
tree21ba8cc742da9a70af693dfe62786063b26eaa96 /lib
parente196cc0e2afeb6299824fb74a6176b59a75764fd (diff)
parent83491c6c58f6c84abc71c6eee704deca1c1c7930 (diff)
downloadnextcloud-server-d37034f1612279b07c78284771ac73fbd5a2a407.tar.gz
nextcloud-server-d37034f1612279b07c78284771ac73fbd5a2a407.zip
Merge pull request #24683 from doc75/federation_confidentiality
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Federation/CloudIdManager.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/Federation/CloudIdManager.php b/lib/private/Federation/CloudIdManager.php
index d99fc350520..02e3c7cd513 100644
--- a/lib/private/Federation/CloudIdManager.php
+++ b/lib/private/Federation/CloudIdManager.php
@@ -86,7 +86,13 @@ class CloudIdManager implements ICloudIdManager {
if (isset($entry['CLOUD'])) {
foreach ($entry['CLOUD'] as $cloudID) {
if ($cloudID === $cloudId) {
- return $entry['FN'];
+ // Warning, if user decides to make his full name local only,
+ // no FN is found on federated servers
+ if (isset($entry['FN'])) {
+ return $entry['FN'];
+ } else {
+ return $cloudID;
+ }
}
}
}