diff options
| -rw-r--r-- | lib/private/legacy/user.php | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/private/legacy/user.php b/lib/private/legacy/user.php index 0a52be7565d..661242a659a 100644 --- a/lib/private/legacy/user.php +++ b/lib/private/legacy/user.php @@ -187,7 +187,18 @@ class OC_User { if ($uid) { if (self::getUser() !== $uid) { self::setUserId($uid); - self::setDisplayName($uid); + $setUidAsDisplayName = true; + if($backend instanceof \OCP\UserInterface + && $backend->implementsActions(OC_User_Backend::GET_DISPLAYNAME)) { + + $backendDisplayName = $backend->getDisplayName($uid); + if(is_string($backendDisplayName) && trim($backendDisplayName) !== '') { + $setUidAsDisplayName = false; + } + } + if($setUidAsDisplayName) { + self::setDisplayName($uid); + } self::getUserSession()->setLoginName($uid); $request = OC::$server->getRequest(); self::getUserSession()->createSessionToken($request, $uid, $uid); |