diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-08-01 13:28:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-01 13:28:27 +0200 |
| commit | 050fa633800ed6fd922732b8461cf12b380818a1 (patch) | |
| tree | 15a19e474006f7bf43c797c1b9bb77ddaebcfa12 /lib | |
| parent | c8452803eff9993a3946656def8596657302033c (diff) | |
| parent | bef4f015ee759bf0c1d938f45871434d33afe8a3 (diff) | |
| download | nextcloud-server-050fa633800ed6fd922732b8461cf12b380818a1.tar.gz nextcloud-server-050fa633800ed6fd922732b8461cf12b380818a1.zip | |
Merge pull request #5939 from nextcloud/dont-have-set-uid-as-displayname
Remove setUidAsDisplayName
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/legacy/user.php | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/private/legacy/user.php b/lib/private/legacy/user.php index fee913f956c..210e428a2e0 100644 --- a/lib/private/legacy/user.php +++ b/lib/private/legacy/user.php @@ -175,18 +175,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(); |