diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-12-28 11:24:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-28 11:24:29 +0100 |
| commit | 1935993e477dbfdd10fc37993033da237b7f75dd (patch) | |
| tree | 05a906bc701ce8821164d2830ca5d9e5a414c535 /lib | |
| parent | afbc2d5cd3f9f05e76b0aeb1dd9c7abdfc8b8f18 (diff) | |
| parent | a8f60c82e4c863054511991d4815c5111bb410db (diff) | |
| download | nextcloud-server-1935993e477dbfdd10fc37993033da237b7f75dd.tar.gz nextcloud-server-1935993e477dbfdd10fc37993033da237b7f75dd.zip | |
Merge pull request #24709 from nextcloud/backport/24683/stable20
[stable20] [Fix #24682]: ensure federation cloud id is retruned if FN property not found
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Federation/CloudIdManager.php | 8 |
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; + } } } } |