aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Wurst <ChristophWurst@users.noreply.github.com>2020-11-25 09:49:20 +0100
committerGitHub <noreply@github.com>2020-11-25 09:49:20 +0100
commit01790537f623ad193308172144216375608b3e0d (patch)
tree30661d60b2b303b12f1d3c7234c720aca8aba231
parent81bf307845b08a201038be558f3178adb091d89a (diff)
parent9cfa8a6c442956e0cef0b46d3001686fe97c9da0 (diff)
downloadnextcloud-server-01790537f623ad193308172144216375608b3e0d.tar.gz
nextcloud-server-01790537f623ad193308172144216375608b3e0d.zip
Merge pull request #24361 from nextcloud/fix/noid/fedshares-displaynames-again
send expected format of cloud id
-rw-r--r--lib/private/Federation/CloudIdManager.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/Federation/CloudIdManager.php b/lib/private/Federation/CloudIdManager.php
index 43bc0d86a38..d99fc350520 100644
--- a/lib/private/Federation/CloudIdManager.php
+++ b/lib/private/Federation/CloudIdManager.php
@@ -110,7 +110,8 @@ class CloudIdManager implements ICloudIdManager {
$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);
}
/**