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
---
program/lib/Roundcube/rcube_config.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
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