From a45a86a812e105f2ea0bac7bd8d30da3efef6a2a Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Mon, 27 Jan 2025 09:48:13 +0100 Subject: [PATCH] Fix sql syntax error on empty filter --- htdocs/core/lib/company.lib.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 5f8794a5e74..0ffc40ac8f8 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -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); }