From bef4f015ee759bf0c1d938f45871434d33afe8a3 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 31 Jul 2017 15:52:53 +0200 Subject: Remove setUidAsDisplayName This code is a leftover from the old Shibboleth implementation from ownCloud days, nowadays it causes more issues than it does good (such as https://github.com/nextcloud/user_saml/pull/137). Let's remove it for the future thus. Signed-off-by: Lukas Reschke --- lib/private/legacy/user.php | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'lib') diff --git a/lib/private/legacy/user.php b/lib/private/legacy/user.php index feed6f836ca..bb345d7481a 100644 --- a/lib/private/legacy/user.php +++ b/lib/private/legacy/user.php @@ -173,18 +173,6 @@ class OC_User { if ($uid) { if (self::getUser() !== $uid) { self::setUserId($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); - } $userSession = self::getUserSession(); $userSession->setLoginName($uid); $request = OC::$server->getRequest(); -- cgit v1.2.3