Skip to content

Commit 83c64f3

Browse files
authored
Merge pull request #590 from nextcloud/fixing-undefined-OfflineUser-composeAndStoreDisplayName
Fix undefined OfflineUser::composeAndStoreDisplayName()
2 parents bf7afcd + 1177c70 commit 83c64f3

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

apps/user_ldap/lib/User_LDAP.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,8 +395,14 @@ public function getDisplayName($uid) {
395395
}
396396

397397
$user = $this->access->userManager->get($uid);
398-
$displayName = $user->composeAndStoreDisplayName($displayName, $displayName2);
399-
$this->access->connection->writeToCache($cacheKey, $displayName);
398+
if ($user instanceof User) {
399+
$displayName = $user->composeAndStoreDisplayName($displayName, $displayName2);
400+
$this->access->connection->writeToCache($cacheKey, $displayName);
401+
}
402+
if ($user instanceof OfflineUser) {
403+
/** @var OfflineUser $user*/
404+
$displayName = $user->getDisplayName();
405+
}
400406
return $displayName;
401407
}
402408

0 commit comments

Comments
 (0)