Merged from stable

diff --git a/auth/ldap/lib.php b/auth/ldap/lib.php
index 8a5ff444a44fbe5e30295beb921e4f08954b59ad..4004013d8aedbff7e766045cc45fbeeead1d693d 100644 (file)
--- a/auth/ldap/lib.php
+++ b/auth/ldap/lib.php
@@ -122,7 +122,7 @@ function auth_get_userinfo($username){
 
     $user_dn = auth_ldap_find_userdn($ldap_connection, $username);
 
-    if (! isset($CFG->ldap_objectclass)) {
+    if (empty($CFG->ldap_objectclass)) {        // Can't send empty filter
         $CFG->ldap_objectclass="objectClass=*";
     }