X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fconnect_db.inc;h=f91d70235fe0bb53eec1dae5182b13030f770dc2;hb=2a0f29497517eca1cde8b2832da5761edefb2268;hp=181651ffdeed9f9169deb37deea7da0384c78c22;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index 181651ff..f91d7023 100644
--- 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,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;
 }
 
@@ -100,7 +100,7 @@ function db_num_fields ($result)
 
 function db_escape($value = "", $nullify = false)
 {
-	$value = @htmlspecialchars($value, ENT_COMPAT, $_SESSION['language']->encoding);
+	$value = @htmlspecialchars($value, ENT_QUOTES, $_SESSION['language']->encoding);
 
   	//reset default if second parameter is skipped
 	$nullify = ($nullify === null) ? (false) : ($nullify);