Merge pull request #13218 from nextcloud/backport/13187/stable15

blizzz · web-flow · commit d1490a96eeab · 2018-12-21T16:59:01.000+01:00
[stable15] do not forgot to store the second displayname portion
diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php
@@ -202,7 +202,7 @@ public function processAttributes($ldapEntry) {
 			$displayName2 = (string)$ldapEntry[$attr][0];
 		}
 		if ($displayName !== '') {
-			$this->composeAndStoreDisplayName($displayName);
+			$this->composeAndStoreDisplayName($displayName, $displayName2);
 			$this->access->cacheUserDisplayName(
 				$this->getUsername(),
 				$displayName,

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ public function processAttributes($ldapEntry) {`
`202`	`202`	`$displayName2 = (string)$ldapEntry[$attr][0];`
`203`	`203`	`}`
`204`	`204`	`if ($displayName !== '') {`
`205`		`- $this->composeAndStoreDisplayName($displayName);`
	`205`	`+ $this->composeAndStoreDisplayName($displayName, $displayName2);`
`206`	`206`	`$this->access->cacheUserDisplayName(`
`207`	`207`	`$this->getUsername(),`
`208`	`208`	`$displayName,`