diff options
| author | alecpl <alec@alec.pl> | 2009-09-10 17:16:26 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2009-09-10 17:16:26 +0000 |
| commit | 71047326faf2feaac3f4017e71dad8d2fa5b2e42 (patch) | |
| tree | 0c8393031fb11048dcab59422de9e0ea95ae112f | |
| parent | b85fce1a7800f589069b4afa57d5adccf8a64a2f (diff) | |
- Fix LDAP partial result warning (#1485536)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/include/rcube_ldap.php | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix LDAP partial result warning (#1485536) - Fix delete in message view deletes permanently with flag_for_deletion=true (#1486101) - Use faster/secure mt_rand() (#1486094) - Fix roundcube hangs on empty inbox with bincimapd (#1486093) diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php index 9854ac01b..82e1df270 100644 --- a/program/include/rcube_ldap.php +++ b/program/include/rcube_ldap.php @@ -388,7 +388,7 @@ class rcube_ldap extends rcube_addressbook $res = null; if ($this->conn && $dn) { - $this->ldap_result = ldap_read($this->conn, base64_decode($dn), '(objectclass=*)', array_values($this->fieldmap)); + $this->ldap_result = @ldap_read($this->conn, base64_decode($dn), '(objectclass=*)', array_values($this->fieldmap)); $entry = @ldap_first_entry($this->conn, $this->ldap_result); if ($entry && ($rec = ldap_get_attributes($this->conn, $entry))) @@ -565,7 +565,7 @@ class rcube_ldap extends rcube_addressbook { $filter = $this->filter ? $this->filter : '(objectclass=*)'; $function = $this->prop['scope'] == 'sub' ? 'ldap_search' : ($this->prop['scope'] == 'base' ? 'ldap_read' : 'ldap_list'); - $this->ldap_result = $function($this->conn, $this->prop['base_dn'], $filter, array_values($this->fieldmap), 0, 0); + $this->ldap_result = @$function($this->conn, $this->prop['base_dn'], $filter, array_values($this->fieldmap), 0, 0); return true; } else |