From 82b55c4db9ac9899656bd586210725eb967c3f03 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 2 Mar 2016 13:02:43 +0100
Subject: untangle different user manager instances, fixes #22770
---
apps/user_ldap/lib/proxy.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'apps/user_ldap/lib')
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);
--
cgit v1.2.3