diff options
| author | Jerome Bakker <jeabakker@coldtrick.com> | 2012-09-28 13:00:29 +0200 |
|---|---|---|
| committer | Jerome Bakker <jeabakker@coldtrick.com> | 2012-09-28 13:00:29 +0200 |
| commit | 7f97152ece45687587f00cb7691d4fa913e8e64b (patch) | |
| tree | 4978018567cd9e4175a0792ebaad976bc7e91933 /engine/lib | |
| parent | 766fe8ebbcc600982dddce4d93b15b65a7b8c1fb (diff) | |
| download | elgg-7f97152ece45687587f00cb7691d4fa913e8e64b.tar.gz elgg-7f97152ece45687587f00cb7691d4fa913e8e64b.tar.bz2 | |
fixed: shortcoming in Elgg's custom PHP error handler
Diffstat (limited to 'engine/lib')
| -rw-r--r-- | engine/lib/elgglib.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 554b0561f..26c1cccfd 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -1070,7 +1070,11 @@ function _elgg_php_error_handler($errno, $errmsg, $filename, $linenum, $vars) { case E_WARNING : case E_USER_WARNING : case E_RECOVERABLE_ERROR: // (e.g. type hint violation) - error_log("PHP WARNING: $error"); + + // check if the error wasn't suppressed by @-functionname + if(error_reporting()){ + error_log("PHP WARNING: $error"); + } break; default: |