From 89f26915152e5aaf357b2aa633d5bea954e4bcc2 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 25 Jun 2014 11:42:15 +0200 Subject: [PATCH] adjust access constructor to master --- apps/user_ldap/lib/access.php | 2 +- apps/user_ldap/lib/wizard.php | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 9eb5836399..ca5d138699 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -835,7 +835,7 @@ class Access extends LDAPUtility implements user\IUserTools { \OCP\Util::writeLog('user_ldap', 'Count filter: '.print_r($filter, true), \OCP\Util::DEBUG); if(is_null($limit)) { - $limit = $this->connection->ldapPagingSize; + $limit = intval($this->connection->ldapPagingSize); } $counter = 0; diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index 1c53a49264..42d612fa73 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -1107,7 +1107,15 @@ class Wizard extends LDAPUtility { $con->setConfiguration($this->configuration->getConfiguration()); $con->ldapConfigurationActive = true; $con->setIgnoreValidation(true); - $ldapAccess = new Access($con, $this->ldap); + + $userManager = new user\Manager( + \OC::$server->getConfig(), + new FilesystemHelper(), + new LogWrapper(), + \OC::$server->getAvatarManager(), + new \OCP\Image()); + + $ldapAccess = new Access($con, $this->ldap, $userManager); return $ldapAccess; }