Skip to content

Fix undefined OfflineUser::composeAndStoreDisplayName() #590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Jul 28, 2016
Merged

Fix undefined OfflineUser::composeAndStoreDisplayName() #590

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[stable9.1] Fix undefined OfflineUser::composeAndStoreDisplayName() - f… 
…ixes #23248
  • Loading branch information
@DeepDiver1975 @schiessle
DeepDiver1975 authored and schiessle committed Jul 27, 2016
commit 1177c70b9d153e0c50c703182a11447bd3e30f95
10 changes: 8 additions & 2 deletions apps/user_ldap/lib/User_LDAP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,8 +384,14 @@ public function getDisplayName($uid) {
}

$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;
}

Expand Down