[Fusionforge-commits] r16039 - branches/Branch_5_1/src/common/include

Thorsten Glaser mirabilos at fusionforge.org
Thu Jul 26 15:52:11 CEST 2012


Author: mirabilos
Date: 2012-07-26 15:52:11 +0200 (Thu, 26 Jul 2012)
New Revision: 16039

Modified:
   branches/Branch_5_1/src/common/include/extras-debug.php
Log:
I just committed a patch to MediaWiki in Debian (for experimental) that
lets wfSuppressWarnings set a global flag for us to use


Modified: branches/Branch_5_1/src/common/include/extras-debug.php
===================================================================
--- branches/Branch_5_1/src/common/include/extras-debug.php	2012-07-23 11:48:39 UTC (rev 16038)
+++ branches/Branch_5_1/src/common/include/extras-debug.php	2012-07-26 13:52:11 UTC (rev 16039)
@@ -9,12 +9,23 @@
 function ffErrorHandler($errno, $errstr, $errfile, $errline)
 {
 	global $ffErrors, $sysdebug_ignored, $sysdebug__aborted;
+	/* Debian-specific MediaWiki patch */
+	global $wf__warnings_suppressed;
 
 	if ($sysdebug__aborted) {
 		/* inside the exception handler, ignore everything */
 		return true;
 	}
 
+	if (isset($wf__warnings_suppressed) && $wf__warnings_suppressed) {
+		/*
+		 * MediaWiki makes use of surrounding sloppily written,
+		 * unclean, unsafe code with wfSuppressWarnings(); and
+		 * wfRestoreWarnings(); calls, we never want to see them
+		 */
+		return true;
+	}
+
 	if (!$sysdebug_ignored && error_reporting() == 0)
 		/* prepended @ to statement => ignore */
 		return false;




More information about the Fusionforge-commits mailing list