Removed obsolete complete parameter.

[fa-stable.git] / includes / db / connect_db.inc

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index d6b6e71ab04f83a35c554b08a2d146de6618997c..3e0d551f2888beef86d29c29466e19da01c999a2 100644 (file)
--- 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;
@@ -28,7 +28,6 @@ function db_query($sql, $err_msg=null)
 {
        global $db, $show_sql, $sql_trail, $select_trail, $go_debug;
        
-       //echo "<br>$sql<br>";
        if ($show_sql)
        {
                echo "<font face=arial size=2 color=000099><b>SQL..</b></font>";
@@ -88,7 +87,7 @@ function db_free_result ($result)
                mysql_free_result($result);
 }
 
-function db_num_rows (&$result)
+function db_num_rows ($result)
 {
        return mysql_num_rows($result);
 }