projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged last changes from stable.
[fa-stable.git]
/
includes
/
errors.inc
diff --git
a/includes/errors.inc
b/includes/errors.inc
index 08a5e5781f6b6e421e087181b0709df02723b08e..8b02f299148413e691d530427361fcc3a0567fef 100644
(file)
--- a/
includes/errors.inc
+++ b/
includes/errors.inc
@@
-93,7
+93,7
@@
function error_handler($errno, $errstr, $file, $line) {
// FIX center is unused now
function fmt_errors($center=false) {
global $messages, $path_to_root, $go_debug;
// FIX center is unused now
function fmt_errors($center=false) {
global $messages, $path_to_root, $go_debug;
-
+
$msg_class = array(
E_USER_ERROR => 'err_msg',
E_USER_WARNING =>'warn_msg',
$msg_class = array(
E_USER_ERROR => 'err_msg',
E_USER_WARNING =>'warn_msg',
@@
-119,7
+119,7
@@
function fmt_errors($center=false) {
$content = ''; // clean other messages
}
}
$content = ''; // clean other messages
}
}
-
+
$str = $msg[1];
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];
$str = $msg[1];
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];