[stable9.1] Fix issues where some user settings cannot be loaded when…

… the user id differs in case sensitivity - fixes #25684 (#25686)
owncloud · Aug 22, 2016 · bbfa0fe · bbfa0fe
1 parent 8003c16
commit bbfa0fe
Showing 1 changed file with 10 additions and 0 deletions.
diff --git 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;