From 6d469912fad3be57954a01e4f289f3d1ec08601c Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Fri, 3 Dec 2021 14:24:00 +0100 Subject: [PATCH] some fixes --- pandora_console/include/db/mysql.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pandora_console/include/db/mysql.php b/pandora_console/include/db/mysql.php index dd3bc26846..872f4a0496 100644 --- a/pandora_console/include/db/mysql.php +++ b/pandora_console/include/db/mysql.php @@ -1339,7 +1339,7 @@ function mysql_db_process_file($path, $handle_error=true) $query = ''; // Begin the transaction - mysql_db_process_sql_begin(); + db_process_sql_begin(); foreach ($file_content as $sql_line) { if (trim($sql_line) != '' && strpos($sql_line, '--') === false) { @@ -1354,7 +1354,7 @@ function mysql_db_process_file($path, $handle_error=true) if (!$result = $query_result) { // Error. Rollback the transaction - mysql_db_process_sql_rollback(); + db_process_sql_rollback(); if ($config['mysqli']) { $error_message = mysqli_error($config['dbconnection']); @@ -1391,7 +1391,7 @@ function mysql_db_process_file($path, $handle_error=true) } // No errors. Commit the transaction - mysql_db_process_sql_commit(); + db_process_sql_commit(); return true; } else { return false; @@ -1430,7 +1430,7 @@ function db_run_sql_file($location) $mysqli->query($config['dbconnection'], 'START TRANSACTION'); } else { // Run commands - mysql_db_process_sql_begin(); + db_process_sql_begin(); // Begin transaction } @@ -1456,7 +1456,7 @@ function db_run_sql_file($location) $mysqli->query($config['dbconnection'], 'COMMIT'); $mysqli->query($config['dbconnection'], 'SET AUTOCOMMIT = 1'); } else { - mysql_db_process_sql_commit(); + db_process_sql_commit(); // Save results } @@ -1466,7 +1466,7 @@ function db_run_sql_file($location) $mysqli->query($config['dbconnection'], 'ROLLBACK '); $mysqli->query($config['dbconnection'], 'SET AUTOCOMMIT = 1'); } else { - mysql_db_process_sql_rollback(); + db_process_sql_rollback(); // Undo results }