diff options
| author | Evan Winslow <evan@elgg.org> | 2012-10-10 00:41:46 -0700 |
|---|---|---|
| committer | Evan Winslow <evan@elgg.org> | 2012-10-10 00:41:46 -0700 |
| commit | 72508cd8c1d2844799764feaf562e26c6ceb91d4 (patch) | |
| tree | 9ee892b4dd511f400a7b71bb50ea3c7b426f97ea /engine | |
| parent | a5a92340ca549dd0ad8516665819f6675d81efa8 (diff) | |
| parent | 7f97152ece45687587f00cb7691d4fa913e8e64b (diff) | |
| download | elgg-72508cd8c1d2844799764feaf562e26c6ceb91d4.tar.gz elgg-72508cd8c1d2844799764feaf562e26c6ceb91d4.tar.bz2 | |
Merge pull request #388 from jeabakker/#4869
Fixes #4869: incorrect PHP error handling in _elgg_php_error_handler
Diffstat (limited to 'engine')
| -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: |