Merge pull request #22400 from nextcloud/backport/22394/stable19

rullzer · web-flow · commit 5cf3c27a0329 · 2020-08-25T09:38:44.000+02:00
[stable19] Fix missing FN from federated contact
diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php
@@ -296,7 +296,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
`@@ -296,7 +296,7 @@ private function getDisplayNameFromAddressBook(string $query, string $property):`
`296`	`296`	`$result = \OC::$server->getContactsManager()->search($query, [$property]);`
`297`	`297`	`foreach ($result as $r) {`
`298`	`298`	`foreach ($r[$property] as $value) {`
`299`		`- if ($value === $query) {`
	`299`	`+ if ($value === $query && $r['FN']) {`
`300`	`300`	`return $r['FN'];`
`301`	`301`	`}`
`302`	`302`	`}`