mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24962 from nextcloud/backport/24683/stable19 

[stable19] [Fix #24682]: ensure federation cloud id is retruned if FN property not found
This commit is contained in:
Julius Härtl 2021-01-07 09:41:40 +01:00 committed by GitHub
parent a713fb71a1 db048845ef
commit 3f8024932a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/Federation/CloudIdManager.php
View File

@ -86,7 +86,13 @@ class CloudIdManager implements ICloudIdManager {
if (isset($entry['CLOUD'])) { if (isset($entry['CLOUD'])) {
foreach ($entry['CLOUD'] as $cloudID) { foreach ($entry['CLOUD'] as $cloudID) {
if ($cloudID === $cloudId) { if ($cloudID === $cloudId) {
// 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']; return $entry['FN'];
} else {
return $cloudID;
}
} }
} }
} }