Merge v20

This commit is contained in:
Laurent Destailleur
2024-10-19 14:44:55 +02:00
25 changed files with 209 additions and 102 deletions

View File

@@ -1369,7 +1369,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
if ($bentityon) { // only if entity enable
$maskrefclient_sql .= " AND entity IN (".getEntity($sharetable).")";
} elseif (!empty($forceentity)) {
$sql .= " AND entity IN (".$db->sanitize($forceentity).")";
$maskrefclient_sql .= " AND entity IN (".$db->sanitize($forceentity).")";
}
if ($where) {
$maskrefclient_sql .= $where; //use the same optional where as general mask