Changes up to 2.3.7 merged into unstable branch.

[fa-stable.git] / includes / errors.inc

diff --git a/includes/errors.inc b/includes/errors.inc
index 9a5af3b863f8f6b2c6611604033dc827522ad382..89aae72fe29f2e1570b70fb904b39927ddad5d8a 100644 (file)
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -102,6 +102,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) { 
@@ -115,8 +118,9 @@ function fmt_errors($center=false) {
                        }
                }
            $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 .= '<br>'.$msg[4];
                $content .= ($cnt ? '<hr>' : '').$str;