diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-04-23 17:49:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-23 17:49:07 +0200 |
| commit | 83b0ce0955bc5ff92cec54aeb8a35dd798221dfc (patch) | |
| tree | b41a59b9efea5e9bba1e70167083371a8848bcf5 | |
| parent | 9b150001ffe8eedeb04d64e870a618f1c0680e1f (diff) | |
| parent | ed5f53bd49cc739defefe2fce7e42579746ceed2 (diff) | |
| download | nextcloud-server-83b0ce0955bc5ff92cec54aeb8a35dd798221dfc.tar.gz nextcloud-server-83b0ce0955bc5ff92cec54aeb8a35dd798221dfc.zip | |
Merge pull request #9278 from nextcloud/bug/noid/ldap-wizard-newaccess
Access needs UserManager, missed to add in #8833
| -rw-r--r-- | apps/user_ldap/ajax/wizard.php | 3 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Access.php | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php index df178ac0a82..daee5ebf94d 100644 --- a/apps/user_ldap/ajax/wizard.php +++ b/apps/user_ldap/ajax/wizard.php @@ -69,7 +69,8 @@ $access = new \OCA\User_LDAP\Access( $ldapWrapper, $userManager, new \OCA\User_LDAP\Helper(\OC::$server->getConfig()), - \OC::$server->getConfig() + \OC::$server->getConfig(), + \OC::$server->getUserManager() ); $wizard = new \OCA\User_LDAP\Wizard($configuration, $ldapWrapper, $access); diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index 2395da1ec90..4736e365504 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -50,7 +50,6 @@ use OCA\User_LDAP\User\IUserTools; use OCA\User_LDAP\User\Manager; use OCA\User_LDAP\User\OfflineUser; use OCA\User_LDAP\Mapping\AbstractMapping; - use OC\ServerNotAvailableException; use OCP\IConfig; use OCP\IUserManager; |