Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/roundcube/roundcubemail.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2021-03-31 19:26:15 +0300
committerAleksander Machniak <alec@alec.pl>2021-03-31 19:26:15 +0300
commit18b980cfb1d89ff0360272803ed93559b5f0f61f (patch)
treecacf750b96b1dc9881333df2ad97bc07f9739e00
parentd0dccc706670f28914a27117b563f82ab5c0360f (diff)
Fix bug where contacts search didn't work with addressbook_search_mods set to an empty array (#7974)
-rw-r--r--CHANGELOG1
-rw-r--r--program/steps/addressbook/search.inc4
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1f732b8ca..819eefe34 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix bug where contacts search didn't work with addressbook_search_mods set to an empty array (#7974)
- Enigma: Fix bug where signature verification could fail for non-ascii bodies (#7919)
- Fix bug causing some HTML message content to be not centered in Elastic skin (#7911)
diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc
index 1564a3eeb..15af27d67 100644
--- a/program/steps/addressbook/search.inc
+++ b/program/steps/addressbook/search.inc
@@ -114,13 +114,13 @@ function rcmail_contact_search()
// quick-search
else {
$search = trim(rcube_utils::get_input_value('_q', rcube_utils::INPUT_GET, true));
- $fields = explode(',', rcube_utils::get_input_value('_headers', rcube_utils::INPUT_GET));
+ $fields = rcube_utils::get_input_value('_headers', rcube_utils::INPUT_GET);
if (empty($fields)) {
$fields = array_keys($SEARCH_MODS_DEFAULT);
}
else {
- $fields = array_filter($fields);
+ $fields = array_filter(explode(',', $fields));
}
// update search_mods setting