lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX sql error when values for natural_search is an array

Browse Source
This commit is contained in:
Laurent Destailleur 2021-11-01 02:28:41 +01:00
parent 2313da5beb
commit e4613b3104
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/ticket/list.php
View File

@ -383,15 +383,16 @@ foreach ($search as $key => $val) {
$sql .= natural_search($key, join(',', $newarrayofstatus), 2); $sql .= natural_search($key, join(',', $newarrayofstatus), 2);
} }
continue; continue;
} } elseif ($key == 'fk_user_assign' || $key == 'fk_user_create' || $key == 'fk_project') {
if ($key == 'fk_user_assign' || $key == 'fk_user_create' || $key == 'fk_project') {
if ($search[$key] > 0) { if ($search[$key] > 0) {
$sql .= natural_search($key, $search[$key], 2); $sql .= natural_search($key, $search[$key], 2);
} }
continue; continue;
} }
$mode_search = ((!empty($object->fields[$key]) && ($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key]))) ? 1 : 0); $mode_search = ((!empty($object->fields[$key]) && ($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key]))) ? 1 : 0);
if ($search[$key] != '') { // $search[$key] can be an array of values, or a string. We add filter if array not empty or if it is a string.
if ((is_array($search[$key]) && !empty($search[$key])) || (!is_array($search[$key]) && $search[$key] != '')) {
$sql .= natural_search($key, $search[$key], $mode_search); $sql .= natural_search($key, $search[$key], $mode_search);
} }
} }