From 004f866f203cbca3fd9ed5547dd849da2d0882ff Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Wed, 13 Feb 2013 13:58:55 +0100 Subject: Prepare for VLV auto-detection (requries 'config_root_dn' config option) --- program/lib/Roundcube/rcube_ldap.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'program/lib/Roundcube/rcube_ldap.php') diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php index c117b799a..81ca0d138 100644 --- a/program/lib/Roundcube/rcube_ldap.php +++ b/program/lib/Roundcube/rcube_ldap.php @@ -194,6 +194,7 @@ class rcube_ldap extends rcube_addressbook // initialize ldap wrapper object $this->prop['attributes'] = array_values($this->fieldmap); $this->ldap = new rcube_ldap_generic($this->prop, true); + $this->ldap->set_cache($this->cache); $this->_connect(); } @@ -673,7 +674,7 @@ class rcube_ldap extends rcube_addressbook if ($this->prop['vlv_search'] && $this->ready && join(',', (array)$fields) == join(',', $list_fields)) { $entries = $this->ldap->search($this->base_dn, $this->prop['filter'], $this->prop['scope'], $this->prop['attributes'], - array('vlv' => true, 'search' => $value, 'sort' => $this->prop['sort'])); + array('search' => $value, 'sort' => $this->prop['sort'])); $this->result = new rcube_result_set(0); if ($entries === false) { -- cgit v1.2.3