summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2012-05-08 14:02:16 +0200
committerArthur Schiwon <blizzz@owncloud.com>2012-05-08 14:02:16 +0200
commitd01db3a8079eb792174b18efbaf99e8537756730 (patch)
treed2e16a68d2db5c3f85bc1dd94fcc32de992e691f /apps
parent5dee914ed2b45c4956fbab1449a6ecc369e959f6 (diff)
downloadnextcloud-server-d01db3a8079eb792174b18efbaf99e8537756730.tar.gz
nextcloud-server-d01db3a8079eb792174b18efbaf99e8537756730.zip
LDAP: make sure, configuration is read when a public method needs it
Diffstat (limited to 'apps')
-rwxr-xr-xapps/user_ldap/lib_ldap.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index 505181ff882..9de03a07fef 100755
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -120,6 +120,7 @@ class OC_LDAP {
return $dn;
} else {
//fallback: user is not mapped
+ self::init();
$filter = self::combineFilterWithAnd(array(
self::$ldapUserFilter,
self::$ldapUserDisplayName . '=' . $name,
@@ -431,6 +432,7 @@ class OC_LDAP {
* Executes an LDAP search
*/
static public function searchUsers($filter, $attr = null) {
+ self::init();
return self::search($filter, self::$ldapBaseUsers, $attr);
}
@@ -443,6 +445,7 @@ class OC_LDAP {
* Executes an LDAP search
*/
static public function searchGroups($filter, $attr = null) {
+ self::init();
return self::search($filter, self::$ldapBaseGroups, $attr);
}