From 3c884af99bed1eac771c36f1223d2870dc0031e4 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 6 Dec 2008 19:08:29 +0000
Subject: - Fix search results page jumps in LDAP addressbook (#1485253)

---
 CHANGELOG                      | 1 +
 program/include/rcube_ldap.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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);
-- 
cgit v1.2.3