summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_config.php5
-rw-r--r--program/include/rcube_ldap.php4
2 files changed, 8 insertions, 1 deletions
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 1b621e0fc..9db746fe8 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -49,6 +49,11 @@ class rcube_config
public function __construct()
{
$this->load();
+
+ // Defaults, that we do not require you to configure,
+ // but contain information that is used in various
+ // locations in the code:
+ $this->set('contactlist_fields', array('name', 'firstname', 'surname', 'email'));
}
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index 6a32a23ef..3a7fc1805 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -767,7 +767,9 @@ class rcube_ldap extends rcube_addressbook
}
// use VLV pseudo-search for autocompletion
- if ($this->prop['vlv_search'] && $this->conn && join(',', (array)$fields) == 'name,firstname,surname,email')
+ $rcmail = rcmail::get_instance();
+
+ if ($this->prop['vlv_search'] && $this->conn && join(',', (array)$fields) == join(',', $rcmail->config->get('contactlist_fields')))
{
// add general filter to query
if (!empty($this->prop['filter']) && empty($this->filter))