X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fconnect_db.inc;h=5babac1bd4f3676bd5f6d2874df2e37cb6ca736f;hb=f36d4241ba673261532a1bb3c59b6b985901238e;hp=dc2dd027ede11c4aadcb1acafbed14be6c8b30fa;hpb=c3d277136992c82db575d5e38f0906625b07da2c;p=fa-stable.git
diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index dc2dd027..5babac1b 100644
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -12,12 +12,12 @@
function set_global_connection()
{
- global $db;
+ global $db, $transaction_level;
+
+ cancel_transaction(); // cancel all aborted transactions if any
+ $transaction_level = 0;
- if (isset($_SESSION["wa_current_user"]) && $_SESSION["wa_current_user"]->company !='')
- $db = $_SESSION["wa_current_user"]->get_db_connection();
- else
- $db = null;
+ $db = $_SESSION["wa_current_user"]->get_db_connection();
}
$db_duplicate_error_code = 1062;
@@ -26,19 +26,13 @@ $db_duplicate_error_code = 1062;
function db_query($sql, $err_msg=null)
{
- global $db, $show_sql, $sql_trail, $select_trail, $go_debug;
+ global $db, $show_sql, $sql_trail, $select_trail, $go_debug, $sql_queries, $Ajax;
- if (!$err_msg && $go_debug)
- $err_msg = "Debug mode error";
- //echo "
$sql
";
if ($show_sql)
{
- echo "SQL..";
- echo "
"; - echo $sql; - echo "\n"; + $Ajax->activate('footer_debug'); + $sql_queries .= "
$sql\n