Merge pull request #12707 from frederic34/patch-23

$type and $module are not defined
This commit is contained in:
Laurent Destailleur 2019-12-14 13:44:48 +01:00 committed by GitHub
commit 4562d00ac5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1286,9 +1286,9 @@ class Setup extends DolibarrApi
$sql = "SELECT rowid, code, pos, label, use_default, description"; $sql = "SELECT rowid, code, pos, label, use_default, description";
$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_type as t"; $sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_type as t";
$sql .= " WHERE t.active = ".$active; $sql .= " WHERE t.active = ".(int) $active;
if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'"; // if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
if ($module) $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'"; // if ($module) $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
// Add sql filters // Add sql filters
if ($sqlfilters) if ($sqlfilters)
{ {