tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some fixes

This commit is contained in:
fbsanchez 2021-12-03 14:24:00 +01:00
parent 5b06415235
commit 6d469912fa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/db/mysql.php
View File

@ -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
}