From: Brian Wolff <bawolff+wn@gmail.com>
Date: Thu, 13 Dec 2012 22:16:22 +0000 (-0400)
Subject: Make wfSuppressWarnings kill E_STRICT in PHP 5.4+
X-Git-Tag: 1.31.0-rc.0~21285
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=02f6386b3b1cd1b8f5d842b62bbccb5ae5a9f08c;p=lhc%2Fweb%2Fwiklou.git

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
---

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;
 	}