X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fconnect_db.inc;h=d6b6e71ab04f83a35c554b08a2d146de6618997c;hb=510d6e1925c4d1621ae3efd85e117cc9bb4320f0;hp=fa57b678fc4d530e3f98961a96725ee93cb74487;hpb=4cf1c3dbb9ae74e0c47dda456f7ac97c7659b3fa;p=fa-stable.git
diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index fa57b678..d6b6e71a 100644
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -26,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 "
$sql
";
if ($show_sql)
{
@@ -49,12 +49,13 @@ function db_query($sql, $err_msg=null)
}
}
- if ($err_msg != null)
- if (function_exists('xdebug_call_file'))
- check_db_error('
At file '.xdebug_call_file().':'.xdebug_call_line().':
'.$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('
At file '.xdebug_call_file().':'.xdebug_call_line().':
'.$err_msg, $sql, $exit);
+ else
+ check_db_error($err_msg, $sql, $exit);
+ }
return $result;
}
@@ -99,7 +100,8 @@ function db_num_fields ($result)
function db_escape($value = "", $nullify = false)
{
- $value = @htmlspecialchars($value, ENT_COMPAT, $_SESSION['language']->encoding);
+ $value = @html_entity_decode($value, ENT_QUOTES, $_SESSION['language']->encoding);
+ $value = @htmlspecialchars($value, ENT_QUOTES, $_SESSION['language']->encoding);
//reset default if second parameter is skipped
$nullify = ($nullify === null) ? (false) : ($nullify);