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 181651ffdeed9f9169deb37deea7da0384c78c22..dc2dd027ede11c4aadcb1acafbed14be6c8b30fa 100644 (file)
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -9,7 +9,6 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-set_global_connection();
 
 function set_global_connection()
 {
@@ -27,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)
        {