Merge pull request #34374 from nextcloud/backport/34219/stable25

[stable25] Add fallback options for contacts array
nextcloud · Oct 3, 2022 · 46180dd · 46180dd
2 parents d847a89 + b1617bc
commit 46180dd
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/lib/private/Collaboration/Collaborators/MailPlugin.php b/lib/private/Collaboration/Collaborators/MailPlugin.php
@@ -165,8 +165,8 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 							if (!$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
 								$singleResult = [[
 									'label' => $displayName,
-									'uuid' => $contact['UID'],
-									'name' => $contact['FN'],
+									'uuid' => $contact['UID'] ?? $emailAddress,
+									'name' => $contact['FN'] ?? $displayName,
 									'value' => [
 										'shareType' => IShare::TYPE_USER,
 										'shareWith' => $cloud->getUser(),
@@ -205,8 +205,8 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 							if ($addToWide && !$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
 								$userResults['wide'][] = [
 									'label' => $displayName,
-									'uuid' => $contact['UID'],
-									'name' => $contact['FN'],
+									'uuid' => $contact['UID'] ?? $emailAddress,
+									'name' => $contact['FN'] ?? $displayName,
 									'value' => [
 										'shareType' => IShare::TYPE_USER,
 										'shareWith' => $cloud->getUser(),
@@ -226,8 +226,8 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 						}
 						$result['exact'][] = [
 							'label' => $displayName,
-							'uuid' => $contact['UID'],
-							'name' => $contact['FN'],
+							'uuid' => $contact['UID'] ?? $emailAddress,
+							'name' => $contact['FN'] ?? $displayName,
 							'type' => $emailAddressType ?? '',
 							'value' => [
 								'shareType' => IShare::TYPE_EMAIL,
@@ -237,8 +237,8 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 					} else {
 						$result['wide'][] = [
 							'label' => $displayName,
-							'uuid' => $contact['UID'],
-							'name' => $contact['FN'],
+							'uuid' => $contact['UID'] ?? $emailAddress,
+							'name' => $contact['FN'] ?? $displayName,
 							'type' => $emailAddressType ?? '',
 							'value' => [
 								'shareType' => IShare::TYPE_EMAIL,