diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2014-06-25 11:42:15 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2014-06-25 11:46:21 +0200 |
| commit | 89f26915152e5aaf357b2aa633d5bea954e4bcc2 (patch) | |
| tree | 506cfc7e7afd780619f2136a3612dc98ba27929c /apps/user_ldap | |
| parent | 452efa5fababa7c64ad450fda781c5d0c099c02e (diff) | |
| download | nextcloud-server-89f26915152e5aaf357b2aa633d5bea954e4bcc2.tar.gz nextcloud-server-89f26915152e5aaf357b2aa633d5bea954e4bcc2.zip | |
adjust access constructor to master
Diffstat (limited to 'apps/user_ldap')
| -rw-r--r-- | apps/user_ldap/lib/access.php | 2 | ||||
| -rw-r--r-- | 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 9eb5836399e..ca5d1386995 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 1c53a492644..42d612fa736 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; } |