Four minor bug fixes

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

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index cedfd787c09f110f977b4ec1f19f67592af84a7f..0b6e4eb919965321d48c68a67b16b1852e44d4ac 100644 (file)
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -2,7 +2,7 @@
 
 set_global_connection();
 
-function set_global_connection() 
+function set_global_connection()
 {
        global $db;
 
@@ -27,30 +27,32 @@ function db_query($sql, $err_msg=null)
                echo "<pre>";
                echo $sql;
                echo "</pre>\n";
-       }       
-       
+       }
 
-       $result = mysql_query($sql, $db);
 
+       $result = mysql_query($sql, $db);
        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);
 
        return $result;
 }
 
-function db_fetch_row (&$result) 
+function db_fetch_row ($result)
 {
 
        return mysql_fetch_row($result);
 }
 
-function db_fetch (&$result) 
+function db_fetch ($result)
 {
 
-       return mysql_fetch_array(&$result);
+       return mysql_fetch_array($result);
 }
 
-function db_seek (&$result,$record) 
+function db_seek (&$result,$record)
 {
        mysql_data_seek($result, $record);
 }
@@ -66,12 +68,12 @@ function db_num_rows (&$result)
        return mysql_num_rows($result);
 }
 
-function db_num_fields (&$result)
+function db_num_fields ($result)
 {
        return mysql_num_fields($result);
 }
 
-function db_escape (&$result)
+function db_escape ($result)
 {
        return mysql_escape_string($result);
 }
@@ -82,7 +84,7 @@ function db_error_no ()
        return mysql_errno($db);
 }
 
-function db_error_msg(&$conn)
+function db_error_msg($conn)
 {
        return mysql_error($conn);
 }