Parse error

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

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index 7de0c108954af0290cc93fc04e5ef4854ed48953..fd6870e947ed121d58ec558a13a00561b523c3f5 100644 (file)
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -1,15 +1,14 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-set_global_connection();
 
 function set_global_connection()
 {
@@ -27,8 +26,8 @@ $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;
+       
        //echo "<br>$sql<br>";
        if ($show_sql)
        {
@@ -50,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;
 }