From 004f866f203cbca3fd9ed5547dd849da2d0882ff Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 13 Feb 2013 07:58:55 -0500
Subject: [PATCH] Prepare for VLV auto-detection (requries 'config_root_dn' config option)
---
program/lib/Roundcube/rcube_ldap.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php
index c117b79..81ca0d1 100644
--- a/program/lib/Roundcube/rcube_ldap.php
+++ b/program/lib/Roundcube/rcube_ldap.php
@@ -194,6 +194,7 @@
// 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 @@
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) {
--
Gitblit v1.9.1