diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2016-08-29 19:56:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-29 19:56:35 +0200 |
commit | 7c7f862712d010123baa1a02b5e0978df9819f7d (patch) | |
tree | 4e823115f3e2c6609e0c56dcef30556663c680ea /lib | |
parent | 39749c0cd45131253f24386a3877682bee0934a9 (diff) | |
parent | 82e8762c8409ea2e831f7076079fb81e4adfdb01 (diff) | |
download | nextcloud-server-7c7f862712d010123baa1a02b5e0978df9819f7d.tar.gz nextcloud-server-7c7f862712d010123baa1a02b5e0978df9819f7d.zip |
Merge pull request #1142 from nextcloud/fix-case-sensitive-settings
Fix issues where some user settings cannot be loaded when the user id…
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/User/Manager.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php index f41468d4926..7d8c6d48b2c 100644 --- a/lib/private/User/Manager.php +++ b/lib/private/User/Manager.php @@ -157,6 +157,16 @@ class Manager extends PublicEmitter implements IUserManager { return $this->cachedUsers[$uid]; } + if (method_exists($backend, 'loginName2UserName')) { + $loginName = $backend->loginName2UserName($uid); + if ($loginName !== false) { + $uid = $loginName; + } + if (isset($this->cachedUsers[$uid])) { + return $this->cachedUsers[$uid]; + } + } + $user = new User($uid, $backend, $this, $this->config); if ($cacheUser) { $this->cachedUsers[$uid] = $user; |