Demon has submitted this change and it was merged.

Change subject: Make wfSuppressWarnings kill E_STRICT in PHP 5.4+
......................................................................


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
---
M includes/GlobalFunctions.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Demon: Verified; Looks good to me, approved



diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 65fc643..4228fa5 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2216,7 +2216,7 @@
                        if( !defined( 'E_DEPRECATED' ) ) {
                                define( 'E_DEPRECATED', 8192 );
                        }
-                       $originalLevel = error_reporting( E_ALL & ~( E_WARNING 
| E_NOTICE | E_USER_WARNING | E_USER_NOTICE | E_DEPRECATED ) );
+                       $originalLevel = error_reporting( E_ALL & ~( E_WARNING 
| E_NOTICE | E_USER_WARNING | E_USER_NOTICE | E_DEPRECATED | E_USER_DEPRECATED 
| E_STRICT ) );
                }
                ++$suppressCount;
        }

-- 
To view, visit https://gerrit.wikimedia.org/r/44166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1ace158dac1733e6b2b2c1d533004d9bcab8c80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_19
Gerrit-Owner: Brian Wolff <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: MarkAHershberger <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to