Revert "Correction to work good with the Net_LDAP2 2.2.0"

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

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

-        return $dn;
+        return $result->current()->dn();
    }

    /**