projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes form stabel branch up to the current state (2.3.22+).
[fa-stable.git]
/
includes
/
errors.inc
diff --git
a/includes/errors.inc
b/includes/errors.inc
index 9b40fa9f887e4c08c2b25f758319463e59d0d12f..1102271b658094677b6522362ce5bcf942cb7431 100644
(file)
--- a/
includes/errors.inc
+++ b/
includes/errors.inc
@@
-62,7
+62,8
@@
function error_handler($errno, $errstr, $file, $line) {
// Please use restrainedly to not risk loss of important messages
$excluded_warnings = array(
'html_entity_decode', 'htmlspecialchars', // nevermind encodings, special chars are processed anyway
// Please use restrainedly to not risk loss of important messages
$excluded_warnings = array(
'html_entity_decode', 'htmlspecialchars', // nevermind encodings, special chars are processed anyway
- 'should be compatible with that' // ignore cpdf/frontreport wrapper warnings
+ 'should be compatible with that', // ignore cpdf/frontreport wrapper warnings
+ 'mysql extension is deprecated' // ignore strict warning in 5.4
);
foreach($excluded_warnings as $ref) {
if (strpos($errstr, $ref) !== false) {
);
foreach($excluded_warnings as $ref) {
if (strpos($errstr, $ref) !== false) {
@@
-76,7
+77,9
@@
function error_handler($errno, $errstr, $file, $line) {
// error_reporting==0 when messages are set off with @
if ($errno & error_reporting()) {
// 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;
}
else if($errno&~E_NOTICE) { // log all not displayed messages
$user = @$_SESSION["wa_current_user"]->loginname;
@@
-193,10
+196,14
@@
function display_db_error($msg, $sql_statement=null, $exit=true)
}
$str .= "<br><br>";
}
$str .= "<br><br>";
- if($msg)
- trigger_error($str, E_USER_ERROR);
- else // $msg can be null here only in debug mode, otherwise the error is ignored
- trigger_error($str, E_USER_WARNING);
+ if ($go_debug)
+ error_log($str);
+ else {
+ if($msg)
+ trigger_error($str, E_USER_ERROR);
+ else // $msg can be null here only in debug mode, otherwise the error is ignored
+ trigger_error($str, E_USER_WARNING);
+ }
if ($exit)
exit;
}
if ($exit)
exit;
}