summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2008-12-06 19:08:29 +0000
committeralecpl <alec@alec.pl>2008-12-06 19:08:29 +0000
commit3c884af99bed1eac771c36f1223d2870dc0031e4 (patch)
tree1cd0199a6eb9b985377be03ca88468a6366014d2
parent0b5539e3dc4e9f1f651defc9633d284ed3a950b5 (diff)
- Fix search results page jumps in LDAP addressbook (#1485253)
-rw-r--r--CHANGELOG1
-rw-r--r--program/include/rcube_ldap.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 369b1f73b..b0d3e127f 100644
--- a/CHANGELOG
+++ b/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/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index bbbff46a4..0c68bc999 100644
--- a/program/include/rcube_ldap.php
+++ b/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);