Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix sql syntax error on empty filter

Browse Source
This commit is contained in:
Laurent Destailleur (aka Eldy)
2025-01-27 09:48:13 +01:00
parent 0ffc50e942
commit a45a86a812
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/core/lib/company.lib.php
View File

@@ -2000,19 +2000,24 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = null, $nopr
}
if (is_array($actioncode) && !empty($actioncode)) {
$sql .= ' AND (';
$tmpsql = '';
foreach ($actioncode as $key => $code) {
if ((string) $code == '-1') {
if ((string) $code === '-1' || (string) $code === '') {
continue;
}
if ($key != 0) {
$sql .= " OR ";
$tmpsql .= " OR ";
}
if (!empty($code)) {
addEventTypeSQL($sql, $code, "");
addEventTypeSQL($tmpsql, $code, "");
}
}
$sql .= ')';
if ($tmpsql) {
$sql .= ' AND (';
$sql .= $tmpsql;
$sql .= ')';
}
} elseif (!empty($actioncode) && $actioncode != '-1') {
addEventTypeSQL($sql, $actioncode);
}