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

Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
ldestailleur
2025-04-21 13:52:25 +02:00
parent 19b322178c ae5750f099
commit 7db8252225
12 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/api/class/api_setup.class.php
View File

@@ -86,8 +86,9 @@ class Setup extends DolibarrApi
$sql = "SELECT t.rowid as id, t.elementtype, t.code, t.contexts, t.label, t.description, t.rang";
$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as t";
$sql .= " WHERE 1=1";
if (!empty($elementtype)) {
$sql .= " WHERE t.elementtype = '".$this->db->escape($elementtype)."'";
$sql .= " AND t.elementtype = '".$this->db->escape($elementtype)."'";
}
// Add sql filters
if ($sqlfilters) {