From 82e8762c8409ea2e831f7076079fb81e4adfdb01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 22 Aug 2016 20:25:20 +0200 Subject: [PATCH] Fix issues where some user settings cannot be loaded when the user id differs in case sensitivity - fixes #25684 (#25686) --- lib/private/User/Manager.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php index f41468d492..7d8c6d48b2 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;