From 02f6386b3b1cd1b8f5d842b62bbccb5ae5a9f08c Mon Sep 17 00:00:00 2001 From: Brian Wolff Date: Thu, 13 Dec 2012 18:16:22 -0400 Subject: [PATCH] Make wfSuppressWarnings kill E_STRICT in PHP 5.4+ Since PHP 5.4+ E_STRICT is now included in E_ALL. Hence wfSuppressWarnings was not filtering E_STRICT. There was some complaints on project:support_desk about timezone warnings popping up. See also bug 43092 Change-Id: Ie1ace158dac1733e6b2b2c1d533004d9bcab8c80 --- includes/GlobalFunctions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 7833a71f06..d0a20422c4 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -2360,7 +2360,7 @@ function wfSuppressWarnings( $end = false ) { } } else { if ( !$suppressCount ) { - $originalLevel = error_reporting( E_ALL & ~( E_WARNING | E_NOTICE | E_USER_WARNING | E_USER_NOTICE | E_DEPRECATED | E_USER_DEPRECATED ) ); + $originalLevel = error_reporting( E_ALL & ~( E_WARNING | E_NOTICE | E_USER_WARNING | E_USER_NOTICE | E_DEPRECATED | E_USER_DEPRECATED | E_STRICT ) ); } ++$suppressCount; } -- 2.20.1