diff options
| author | Sem <sembrestels@riseup.net> | 2012-10-19 09:47:11 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-10-19 09:47:11 +0200 |
| commit | 80ca3d447737a679f773cbea7e788ee190abea69 (patch) | |
| tree | 62bd6ec58b5fc8ad02bd529d187591659dc39b65 /engine/lib/elgglib.php | |
| parent | 9a4ed2014e9880130c1bbc52bb980e44a488bad9 (diff) | |
| parent | d134beadb79fcc90a75bda8bbcbfb9987b27470c (diff) | |
| download | elgg-80ca3d447737a679f773cbea7e788ee190abea69.tar.gz elgg-80ca3d447737a679f773cbea7e788ee190abea69.tar.bz2 | |
Merge branch '1.8' of git://github.com/Elgg/Elgg into lorea-preprod
Diffstat (limited to 'engine/lib/elgglib.php')
| -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: |