Correction to work good with the Net_LDAP2 2.2.0

9 years ago · acbc67ea1c
parent 8bbb454524
commit acbc67ea1c
1 changed files with 6 additions and 4 deletions
--- a/plugins/password/drivers/ldap.php
+++ b/plugins/password/drivers/ldap.php
@ -187,12 +187,14 @@ class rcube_ldap_password
        );

        $result = $ldap->search($base, $filter, $options);
-        $ldap->done();
        if (is_a($result, 'PEAR_Error') || ($result->count() != 1)) {
-            return '';
+            $dn = '';
+        } else {
+            $dn = $result->current()->dn();
        }
-
-        return $result->current()->dn();
+        $ldap->done();
+        
+        return $dn;
    }

    /**