diff options
| author | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-07-26 23:36:47 +0300 |
|---|---|---|
| committer | Bjoern Schiessle <bjoern@schiessle.org> | 2016-07-27 12:06:39 +0300 |
| commit | c35b4f12ff49505126594c71952e8f1ccf1cd7e1 (patch) | |
| tree | 1d770f20e5cdb8ac67b1e7be05cfddad376294bc | |
| parent | 900267333e39b09c1ad4c350461ab590f80814e2 (diff) | |
Fix undefined OfflineUser::composeAndStoreDisplayName() - fixes #23248 (#25598)
| -rw-r--r-- | apps/user_ldap/user_ldap.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index 70cceefdedf..c403f03e8da 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -385,8 +385,14 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn } $user = $this->access->userManager->get($uid); - $displayName = $user->composeAndStoreDisplayName($displayName, $displayName2); - $this->access->connection->writeToCache($cacheKey, $displayName); + if ($user instanceof User) { + $displayName = $user->composeAndStoreDisplayName($displayName, $displayName2); + $this->access->connection->writeToCache($cacheKey, $displayName); + } + if ($user instanceof OfflineUser) { + /** @var OfflineUser $user*/ + $displayName = $user->getDisplayName(); + } return $displayName; } |