From 7c04110698958e1541a9f115e1877562d53e5085 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Fri, 18 Mar 2016 07:30:12 -0400 Subject: [PATCH] Fix so contactlist_fields option can be set via config file --- CHANGELOG | 1 + program/lib/Roundcube/rcube_config.php | 7 ++++--- config/defaults.inc.php | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 812fb5b..b163b83 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ - Hide DSN option in Preferences when smtp_server is not used (#1490666) - Protect download urls against CSRF using unique request tokens (#1490642) - newmail_notifier: Refactor desktop notifications +- Fix so contactlist_fields option can be set via config file RELEASE 1.1.4 ------------- diff --git a/config/defaults.inc.php b/config/defaults.inc.php index 308189d..41ef660 100644 --- a/config/defaults.inc.php +++ b/config/defaults.inc.php @@ -936,6 +936,10 @@ // Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode $config['addressbook_search_mode'] = 0; +// List of fields used on contacts list and for autocompletion searches +// Warning: These are field names not LDAP attributes (see 'fieldmap' setting)! +$config['contactlist_fields'] = array('name', 'firstname', 'surname', 'email'); + // Template of contact entry on the autocompletion list. // You can use contact fields as: name, email, organization, department, etc. // See program/steps/addressbook/func.inc for a list diff --git a/program/lib/Roundcube/rcube_config.php b/program/lib/Roundcube/rcube_config.php index e80474a..85d592d 100644 --- a/program/lib/Roundcube/rcube_config.php +++ b/program/lib/Roundcube/rcube_config.php @@ -87,9 +87,10 @@ $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')); + // but contain information that is used in various locations in the code: + if (empty($this->prop['contactlist_fields'])) { + $this->set('contactlist_fields', array('name', 'firstname', 'surname', 'email')); + } } /** -- Gitblit v1.9.1