Merge pull request #22778 from owncloud/fix-22770

untangle different user manager instances, fixes #22770

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