mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22825 from owncloud/backport-22778-stable9 

[backport] [stable9] untangle different user manager instances, fixes #22770
This commit is contained in:
Thomas Müller 2016-03-10 08:26:11 +01:00
parent b017434302 dd556d77da
commit 4e90bc017e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/user_ldap/lib/proxy.php
View File

@ -61,7 +61,7 @@ abstract class Proxy {
static $userMap; static $userMap;
static $groupMap; static $groupMap;
static $db; static $db;
static $userManager; static $coreUserManager;
if(is_null($fs)) { if(is_null($fs)) {
$ocConfig = \OC::$server->getConfig(); $ocConfig = \OC::$server->getConfig();
$fs = new FilesystemHelper(); $fs = new FilesystemHelper();
@ -70,10 +70,10 @@ abstract class Proxy {
$db = \OC::$server->getDatabaseConnection(); $db = \OC::$server->getDatabaseConnection();
$userMap = new UserMapping($db); $userMap = new UserMapping($db);
$groupMap = new GroupMapping($db); $groupMap = new GroupMapping($db);
$userManager = \OC::$server->getUserManager(); $coreUserManager = \OC::$server->getUserManager();
} }
$userManager = $userManager =
new user\Manager($ocConfig, $fs, $log, $avatarM, new \OCP\Image(), $db, $userManager); new user\Manager($ocConfig, $fs, $log, $avatarM, new \OCP\Image(), $db, $coreUserManager);
$connector = new Connection($this->ldap, $configPrefix); $connector = new Connection($this->ldap, $configPrefix);
$access = new Access($connector, $this->ldap, $userManager); $access = new Access($connector, $this->ldap, $userManager);
$access->setUserMapper($userMap); $access->setUserMapper($userMap);