From bbfa0fe833e7a04f64aca0fa03cffef1caa64a76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <DeepDiver1975@users.noreply.github.com>
Date: Mon, 22 Aug 2016 20:25:20 +0200
Subject: [PATCH] [stable9.1] 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 055f428bb175..34ab542982cd 100644
--- a/lib/private/User/Manager.php
+++ b/lib/private/User/Manager.php
@@ -156,6 +156,16 @@ protected function getUserObject($uid, $backend, $cacheUser = true) {
 			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;