summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/lib
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2015-01-06 23:28:49 +0100
committerArthur Schiwon <blizzz@owncloud.com>2015-01-06 23:28:49 +0100
commit40ecd30fba6d29362c455b1f0eef875ff19cd544 (patch)
treec221a9cec19d42588338c308333fc84ef3d84e91 /apps/user_ldap/lib
parent8e488f726c6f6aaaf1b33c6bc53f7ecb417b0d28 (diff)
downloadnextcloud-server-40ecd30fba6d29362c455b1f0eef875ff19cd544.tar.gz
nextcloud-server-40ecd30fba6d29362c455b1f0eef875ff19cd544.zip
inject oc config to User_LDAP
Diffstat (limited to 'apps/user_ldap/lib')
-rw-r--r--apps/user_ldap/lib/jobs/cleanup.php3
-rw-r--r--apps/user_ldap/lib/user/manager.php3
-rw-r--r--apps/user_ldap/lib/user/user.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/user_ldap/lib/jobs/cleanup.php b/apps/user_ldap/lib/jobs/cleanup.php
index 83cfeb048c8..b044f997aa9 100644
--- a/apps/user_ldap/lib/jobs/cleanup.php
+++ b/apps/user_ldap/lib/jobs/cleanup.php
@@ -73,7 +73,8 @@ class CleanUp extends \OC\BackgroundJob\TimedJob {
} else {
$this->userBackend = new User_Proxy(
$this->ldapHelper->getServerConfigurationPrefixes(true),
- new LDAP()
+ new LDAP(),
+ $this->ocConfig
);
}
diff --git a/apps/user_ldap/lib/user/manager.php b/apps/user_ldap/lib/user/manager.php
index 431609071e6..955a2923a64 100644
--- a/apps/user_ldap/lib/user/manager.php
+++ b/apps/user_ldap/lib/user/manager.php
@@ -72,8 +72,7 @@ class Manager {
/**
* @brief Constructor
- * @param \OCP\IConfig respectively an instance that provides the methods
- * setUserValue and getUserValue as implemented in \OCP\Config
+ * @param \OCP\IConfig
* @param \OCA\user_ldap\lib\FilesystemHelper object that gives access to
* necessary functions from the OC filesystem
* @param \OCA\user_ldap\lib\LogWrapper
diff --git a/apps/user_ldap/lib/user/user.php b/apps/user_ldap/lib/user/user.php
index c81fb25b541..7f67ebca39b 100644
--- a/apps/user_ldap/lib/user/user.php
+++ b/apps/user_ldap/lib/user/user.php
@@ -92,7 +92,7 @@ class User {
* @param string the LDAP DN
* @param IUserTools $access an instance that implements IUserTools for
* LDAP interaction
- * @param \OCP\Config
+ * @param \OCP\IConfig
* @param FilesystemHelper
* @param \OCP\Image any empty instance
* @param LogWrapper