Multiply contacts spport added.

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

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index 060637bc87c147f1d394c92c106a36c80cf9d40b..3e0d551f2888beef86d29c29466e19da01c999a2 100644 (file)
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -12,7 +12,10 @@
 
 function set_global_connection()
 {
-       global $db;
+       global $db, $transaction_level;
+
+       cancel_transaction(); // cancel all aborted transactions if any
+       $transaction_level = 0;
 
        $db = $_SESSION["wa_current_user"]->get_db_connection();
 }
@@ -84,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);
 }