diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-03 11:55:10 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-03 11:55:10 +0100 |
| commit | 4f25f341788b3edad1bf4baf739cd632785c9abb (patch) | |
| tree | e2101b0db62b162395d05a68352247fa107184ad /apps/user_ldap | |
| parent | c590372aef337881e50e71e8cc62125753e45200 (diff) | |
| parent | 82b55c4db9ac9899656bd586210725eb967c3f03 (diff) | |
| download | nextcloud-server-4f25f341788b3edad1bf4baf739cd632785c9abb.tar.gz nextcloud-server-4f25f341788b3edad1bf4baf739cd632785c9abb.zip | |
Merge pull request #22778 from owncloud/fix-22770
untangle different user manager instances, fixes #22770
Diffstat (limited to 'apps/user_ldap')
| -rw-r--r-- | apps/user_ldap/lib/proxy.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php index 74e2af45269..7002aaadaa5 100644 --- a/apps/user_ldap/lib/proxy.php +++ b/apps/user_ldap/lib/proxy.php @@ -61,7 +61,7 @@ abstract class Proxy { static $userMap; static $groupMap; static $db; - static $userManager; + static $coreUserManager; if(is_null($fs)) { $ocConfig = \OC::$server->getConfig(); $fs = new FilesystemHelper(); @@ -70,10 +70,10 @@ abstract class Proxy { $db = \OC::$server->getDatabaseConnection(); $userMap = new UserMapping($db); $groupMap = new GroupMapping($db); - $userManager = \OC::$server->getUserManager(); + $coreUserManager = \OC::$server->getUserManager(); } $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); $access = new Access($connector, $this->ldap, $userManager); $access->setUserMapper($userMap); |