X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=c584d175f79e831d3855d0fb672910e55c8df844;hb=66a62190f99d83f958bb98195b5756b8b307e378;hp=16b5be40f4c59c254af75cb26ac2367a77157383;hpb=666628871766f00f177ff4cf7481167a86a07863;p=fa-stable.git diff --git a/includes/errors.inc b/includes/errors.inc index 16b5be40..c584d175 100644 --- a/includes/errors.inc +++ b/includes/errors.inc @@ -27,7 +27,7 @@ function error_handler($errno, $errstr, $file, $line) { return true; } } - + // error_reporting==0 when messages are set off with @ if ($errno & error_reporting()) $messages[] = array($errno, $errstr, $file, $line); @@ -108,7 +108,7 @@ function end_flush() { function display_db_error($msg, $sql_statement=null, $exit=true) { - global $db, $debug, $go_debug; + global $db, $debug, $go_debug, $db_connections; $warning = $msg==null; $db_error = db_error_no(); @@ -127,7 +127,9 @@ function display_db_error($msg, $sql_statement=null, $exit=true) if ($debug == 1) { - $str .= "sql that failed was : " . $sql_statement . "
"; + $cur_prefix = $db_connections[$_SESSION["wa_current_user"]->cur_con]['tbpref']; + + $str .= "sql that failed was : ".str_replace(TB_PREF, $cur_prefix, $sql_statement)."
"; if ($go_debug > 1) display_backtrace(); } @@ -167,7 +169,7 @@ function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_ if ($rollback_if_error) { - $rollback_result = db_query("rollback","could not rollback"); + $rollback_result = db_query("rollback"); } if ($exit_if_error)