Merge pull request #22394 from nextcloud/fix/share-federation-missing-fn

skjnldsv · web-flow · commit 111496c7cd11 · 2020-08-24T18:05:00.000+02:00
Fix missing FN from federated contact
diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php
@@ -316,7 +316,7 @@ private function getDisplayNameFromAddressBook(string $query, string $property):
 		$result = \OC::$server->getContactsManager()->search($query, [$property]);
 		foreach ($result as $r) {
 			foreach ($r[$property] as $value) {
-				if ($value === $query) {
+				if ($value === $query && $r['FN']) {
 					return $r['FN'];
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ private function getDisplayNameFromAddressBook(string $query, string $property):`
`316`	`316`	`$result = \OC::$server->getContactsManager()->search($query, [$property]);`
`317`	`317`	`foreach ($result as $r) {`
`318`	`318`	`foreach ($r[$property] as $value) {`
`319`		`- if ($value === $query) {`
	`319`	`+ if ($value === $query && $r['FN']) {`
`320`	`320`	`return $r['FN'];`
`321`	`321`	`}`
`322`	`322`	`}`