Merged changes in main branch up to v.2.1.2

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

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index 18c27ac9f7a35c45fba64a4ba1110eb6aadfcb53..dc2dd027ede11c4aadcb1acafbed14be6c8b30fa 100644 (file)
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -1,6 +1,14 @@
 <?php
-
-set_global_connection();
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 
 function set_global_connection()
 {
@@ -18,8 +26,10 @@ $db_duplicate_error_code = 1062;
 
 function db_query($sql, $err_msg=null)
 {
-       global $db, $show_sql, $sql_trail, $select_trail;
-
+       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)
        {
@@ -70,7 +80,7 @@ function db_fetch ($result)
 
 function db_seek (&$result,$record)
 {
-       mysql_data_seek($result, $record);
+       return mysql_data_seek($result, $record);
 }
 
 function db_free_result ($result)