extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 19:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Addressbook: Fix advanced search was not including private custom fields when they were on a separate tab

Browse Source
This commit is contained in:
nathan 2023-02-16 08:23:38 -07:00
parent e043153ad4
commit ee244bf282
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -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'))));
if($this->config['private_cf_tab'])
{
$_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]);
if(!$value)
{
unset($query['advanced_search'][$key]);
}
}
// Skip n_fn, it causes problems in sql
unset($query['advanced_search']['n_fn']);