Merge pull request #24361 from nextcloud/fix/noid/fedshares-displaynames-again

ChristophWurst · web-flow · commit 01790537f623 · 2020-11-25T09:49:20.000+01:00
send expected format of cloud id
diff --git a/lib/private/Federation/CloudIdManager.php b/lib/private/Federation/CloudIdManager.php
@@ -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);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,8 @@ public function getCloudId(string $user, string $remote): ICloudId {`
`110`	`110`	`$host = $fixedRemote;`
`111`	`111`	`}`
`112`	`112`	`$id = $user . '@' . $remote;`
`113`		`- return new CloudId($id, $user, $fixedRemote, $this->getDisplayNameFromContact($id));`
	`113`	`+ $displayName = $this->getDisplayNameFromContact($user . '@' . $host);`
	`114`	`+ return new CloudId($id, $user, $fixedRemote, $displayName);`
`114`	`115`	`}`
`115`	`116`
`116`	`117`	`/**`