Fixed error handling in debug mode

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

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index dc2dd027ede11c4aadcb1acafbed14be6c8b30fa..fd6870e947ed121d58ec558a13a00561b523c3f5 100644 (file)
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -28,8 +28,6 @@ function db_query($sql, $err_msg=null)
 {
        global $db, $show_sql, $sql_trail, $select_trail, $go_debug;
        
-       if (!$err_msg && $go_debug) 
-               $err_msg = "Debug mode error";
        //echo "<br>$sql<br>";
        if ($show_sql)
        {
@@ -51,12 +49,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;
 }