diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2016-03-02 13:02:43 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2016-03-02 13:02:43 +0100 |
| commit | 82b55c4db9ac9899656bd586210725eb967c3f03 (patch) | |
| tree | e1ca8760091834cae30f86be54f947253131834f /apps/user_ldap/lib | |
| parent | 6d90651ff0218e4bebea1b6221969abde8a9d841 (diff) | |
| download | nextcloud-server-82b55c4db9ac9899656bd586210725eb967c3f03.tar.gz nextcloud-server-82b55c4db9ac9899656bd586210725eb967c3f03.zip | |
untangle different user manager instances, fixes #22770
Diffstat (limited to 'apps/user_ldap/lib')
| -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); |