From: Jerome Bakker <jeabakker@coldtrick.com>
Date: Fri, 28 Sep 2012 11:00:29 +0000 (+0200)
Subject: fixed: shortcoming in Elgg's custom PHP error handler
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=7f97152ece45687587f00cb7691d4fa913e8e64b;p=lorea%2Felgg.git

fixed: shortcoming in Elgg's custom PHP error handler
---

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: