From ee244bf282ec4b4dac62604a8e19edd11a252f5b Mon Sep 17 00:00:00 2001 From: nathan Date: Thu, 16 Feb 2023 08:23:38 -0700 Subject: [PATCH] Addressbook: Fix advanced search was not including private custom fields when they were on a separate tab --- addressbook/inc/class.addressbook_ui.inc.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index 908ffd282c..8f0dd14957 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -3375,10 +3375,20 @@ class addressbook_ui extends addressbook_bo } else { - $query['advanced_search'] = array_intersect_key($_content,array_flip(array_merge($this->get_contact_columns(),array('operator','meth_select')))); - foreach ($query['advanced_search'] as $key => $value) + if($this->config['private_cf_tab']) { - if(!$value) unset($query['advanced_search'][$key]); + $_content = array_merge($_content, $_content['private_cfs']); + } + $query['advanced_search'] = array_intersect_key( + $_content, + array_flip(array_merge($this->get_contact_columns(), array('operator', 'meth_select'))) + ); + foreach($query['advanced_search'] as $key => $value) + { + if(!$value) + { + unset($query['advanced_search'][$key]); + } } // Skip n_fn, it causes problems in sql unset($query['advanced_search']['n_fn']);