Merge pull request #1156 from nextcloud/stable9.1-db60e65409e7c6d4f1bde5062af53fbad6e8b412

[stable9.1] Fix issues where some user settings cannot be loaded when…
This commit is contained in:
Roeland Jago Douma 2016-08-29 20:33:10 +02:00 committed by GitHub
commit deadbf7567
1 changed files with 10 additions and 0 deletions

View File

@ -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;