Hi, r1025 seems to break ldap search with global filters.

Reverted patch follows.

Index: trunk/roundcubemail/program/include/rcube_ldap.inc

--- trunk/roundcubemail/program/include/rcube_ldap.inc (revision 1025) +++ trunk/roundcubemail/program/include/rcube_ldap.inc (revision 787) @@ -1,3 +1,4 @@ <?php

/* +-----------------------------------------------------------------------+ @@ -288,5 +289,5 @@ // add general filter to query if (!empty($this->prop['filter']))

•  $filter = '(&('.$this->prop['filter'] .')' . $filter . ')';
  

•  $filter = '(&'.$this->prop['filter'] . $filter . ')';
  
  

  // set filter string and execute search

ciao, ema _______________________________________________ List info: http://lists.roundcube.net/dev/