summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2013-11-06 08:58:29 -0800
committerVincent Petry <pvince81@owncloud.com>2013-11-06 08:58:29 -0800
commitf2eef690479ccea86331c3703c7f6f302ca32d49 (patch)
tree1fa56415f9e9a12c60e0f3c9d88bf0e989d87803
parent1fa1cf46bd02f5a453d491d752828193d463067a (diff)
parent95a5ff63b85b5e1ab5bcff6eac09d7a04a3e9112 (diff)
downloadnextcloud-server-f2eef690479ccea86331c3703c7f6f302ca32d49.tar.gz
nextcloud-server-f2eef690479ccea86331c3703c7f6f302ca32d49.zip
Merge pull request #5718 from owncloud/fixLdapBgJob
LDAP: resolve namespace harakiri, fixes background job
-rw-r--r--apps/user_ldap/lib/jobs.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index 2f90da3bfb6..9b108da6331 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -139,12 +139,12 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
return self::$groupBE;
}
$configPrefixes = Helper::getServerConfigurationPrefixes(true);
- $ldapWrapper = new OCA\user_ldap\lib\LDAP();
+ $ldapWrapper = new LDAP();
if(count($configPrefixes) === 1) {
//avoid the proxy when there is only one LDAP server configured
- $connector = new OCA\user_ldap\lib\Connection($ldapWrapper, $configPrefixes[0]);
- $ldapAccess = new OCA\user_ldap\lib\Access($connector, $ldapWrapper);
- self::$groupBE = new OCA\user_ldap\GROUP_LDAP($ldapAccess);
+ $connector = new Connection($ldapWrapper, $configPrefixes[0]);
+ $ldapAccess = new Access($connector, $ldapWrapper);
+ self::$groupBE = new \OCA\user_ldap\GROUP_LDAP($ldapAccess);
} else {
self::$groupBE = new \OCA\user_ldap\Group_Proxy($configPrefixes, $ldapWrapper);
}