diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-12-06 19:08:29 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-12-06 19:08:29 +0000 |
| commit | 9fba2a09430ecc93ab9d6aa294628a0effc8c307 (patch) | |
| tree | 7c2706218338e3d404adc9a0d45657516454419e | |
| parent | 262492772481606e9a793fe765a36f11b5b3b8de (diff) | |
- Fix search results page jumps in LDAP addressbook (#1485253)
git-svn-id: https://svn.roundcube.net/trunk@2127 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_ldap.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 369b1f73b..b0d3e127f 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -4,6 +4,7 @@ CHANGELOG RoundCube Webmail 2008/12/06 (alec) ---------- - Fix sorting of folders with more than 2 levels (#1485569) +- Fix search results page jumps in LDAP addressbook (#1485253) 2008/12/04 (alec) ---------- diff --git a/roundcubemail/program/include/rcube_ldap.php b/roundcubemail/program/include/rcube_ldap.php index bbbff46a4..0c68bc999 100644 --- a/roundcubemail/program/include/rcube_ldap.php +++ b/roundcubemail/program/include/rcube_ldap.php @@ -256,7 +256,7 @@ class rcube_ldap function list_records($cols=null, $subset=0) { // add general filter to query - if (!empty($this->prop['filter'])) + if (!empty($this->prop['filter']) && empty($this->filter)) { $filter = $this->prop['filter']; $this->set_search_set($filter); |