Update from usntable branch.

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

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index 7f0911dcad9e18d03510ca9f9106aba097b3529d..203883b084e0a1fdb90f8c8be1296618cd4c162e 100644 (file)
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -14,10 +14,7 @@ function set_global_connection()
 {
        global $db;
 
-    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,9 +23,8 @@ $db_duplicate_error_code = 1062;
 
 function db_query($sql, $err_msg=null)
 {
-       global $db, $show_sql, $sql_trail, $select_trail;
-
-       //echo "<br>$sql<br>";
+       global $db, $show_sql, $sql_trail, $select_trail, $go_debug;
+       
        if ($show_sql)
        {
                echo "<font face=arial size=2 color=000099><b>SQL..</b></font>";
@@ -49,12 +45,13 @@ function db_query($sql, $err_msg=null)
                }
        }
 
-       if ($err_msg != null)
-         if (function_exists('xdebug_call_file'))
-               check_db_error('<br>At file '.xdebug_call_file().':'.xdebug_call_line().':<br>'.$err_msg, $sql);
-         else
-               check_db_error($err_msg, $sql);
-
+       if ($err_msg != null || $go_debug) {
+               $exit = $err_msg != null;
+               if (function_exists('xdebug_call_file'))
+                       check_db_error('<br>At file '.xdebug_call_file().':'.xdebug_call_line().':<br>'.$err_msg, $sql, $exit);
+               else
+                       check_db_error($err_msg, $sql, $exit);
+       }
        return $result;
 }
 
@@ -87,7 +84,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);
 }