diff options
| author | Julius Härtl <jus@bitgrid.net> | 2021-01-07 09:41:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-07 09:41:40 +0100 |
| commit | 3f8024932a5e8fc7c0f5eecabb6a8d618a12f70c (patch) | |
| tree | 5cf4f7959e7bfb9331ec7930615a920337d5cb6f | |
| parent | a713fb71a1ce596117ccd846d1fb1344152f9f8d (diff) | |
| parent | db048845ef2fede056620def0dd3e66e93722846 (diff) | |
| download | nextcloud-server-3f8024932a5e8fc7c0f5eecabb6a8d618a12f70c.tar.gz nextcloud-server-3f8024932a5e8fc7c0f5eecabb6a8d618a12f70c.zip | |
Merge pull request #24962 from nextcloud/backport/24683/stable19
[stable19] [Fix #24682]: ensure federation cloud id is retruned if FN property not found
| -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; + } } } } |