]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
fixed: shortcoming in Elgg's custom PHP error handler
authorJerome Bakker <jeabakker@coldtrick.com>
Fri, 28 Sep 2012 11:00:29 +0000 (13:00 +0200)
committerJerome Bakker <jeabakker@coldtrick.com>
Fri, 28 Sep 2012 11:00:29 +0000 (13:00 +0200)
engine/lib/elgglib.php

index 554b0561f8ef447fb992fca974f2cf2cbf85f4d8..26c1cccfd9c997bd08bfa91153ae88ef2b725c3b 100644 (file)
@@ -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: