Don't add filters for required fields which are already in search filter

11 years ago · e6a7be8b1f
parent c3fe8a0b7a
commit e6a7be8b1f
1 changed files with 2 additions and 0 deletions
--- a/program/lib/Roundcube/rcube_ldap.php
+++ b/program/lib/Roundcube/rcube_ldap.php
@ -871,6 +871,8 @@ class rcube_ldap extends rcube_addressbook
        // add required (non empty) fields filter
        $req_filter = '';
        foreach ((array)$required as $field) {
+            if (in_array($field, (array)$fields))  // required field is already in search filter
+                continue;
            if ($attrs = $this->_map_field($field)) {
                if (count($attrs) > 1)
                    $req_filter .= '(|';