Make wfSuppressWarnings kill E_STRICT in PHP 5.4+
authorBrian Wolff <bawolff+wn@gmail.com>
Thu, 13 Dec 2012 22:16:22 +0000 (18:16 -0400)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 16 Dec 2012 07:28:57 +0000 (07:28 +0000)
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

index 7833a71..d0a2042 100644 (file)
@@ -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;
        }