Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0

This commit is contained in:
ldestailleur
2025-04-10 14:16:58 +02:00
2 changed files with 4 additions and 2 deletions

View File

@@ -104,7 +104,9 @@ if ($action == "set") {
if (!($res > 0)) {
$error++;
}
} elseif (!$error) {
}
if (!$error) {
$db->commit();
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
} else {

View File

@@ -718,7 +718,7 @@ class DoliDBPgsql extends DoliDB
*/
public function escape($stringtoencode)
{
return pg_escape_string($stringtoencode);
return pg_escape_string($this->db, $stringtoencode);
}
/**