X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=08a5e5781f6b6e421e087181b0709df02723b08e;hb=85f86f5985c98cb9da31d583d0ab74280cd8b3a5;hp=9687b6ddef3b4c21f75cda759e79295d14b10ca9;hpb=09e3e0ae4aec91dd5d4c62d19b9c8550bd78bff1;p=fa-stable.git
diff --git a/includes/errors.inc b/includes/errors.inc
index 9687b6dd..08a5e578 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -76,7 +76,9 @@ function error_handler($errno, $errstr, $file, $line) {
// error_reporting==0 when messages are set off with @
if ($errno & error_reporting()) {
- $messages[] = array($errno, $errstr, $file, $line, @$bt);
+ // suppress duplicated errors
+ if (!in_array(array($errno, $errstr, $file, $line, @$bt), $messages))
+ $messages[] = array($errno, $errstr, $file, $line, @$bt);
}
else if($errno&~E_NOTICE) { // log all not displayed messages
$user = @$_SESSION["wa_current_user"]->loginname;
@@ -102,6 +104,9 @@ function fmt_errors($center=false) {
// $class = 'no_msg';
if (count($messages)) {
foreach($messages as $cnt=>$msg) {
+ if ($go_debug && $msg[0]>E_USER_NOTICE)
+ $msg[0] = E_ERROR;
+
if ($msg[0]>$type) continue;
if ($msg[0]<$type) {
@@ -114,9 +119,11 @@ function fmt_errors($center=false) {
$content = ''; // clean other messages
}
}
+
$str = $msg[1];
- if ($msg[0] < E_USER_ERROR && $msg[2] != null)
+ if (!in_array($msg[0], array(E_USER_NOTICE, E_USER_ERROR, E_USER_WARNING)) && $msg[2] != null)
$str .= ' '._('in file').': '.$msg[2].' '._('at line ').$msg[3];
+
if ($go_debug>1 && $type!=E_USER_NOTICE && $type!=E_USER_WARNING)
$str .= '
'.$msg[4];
$content .= ($cnt ? '