[Pkg-mediawiki-commits] r356 - mediawiki/experimental/debian/patches

[Thorsten Glaser]

Author: tg
Date: 2012-07-26 13:47:02 +0000 (Thu, 26 Jul 2012)
New Revision: 356

Modified:
   mediawiki/experimental/debian/patches/suppress_warnings.patch
Log:
we can do better than manually annotating all occurrences?\226?\128?\166

?\226?\128?\166 since we?\226?\128?\153ve already got a FF-specific patch in here,
why not do it right? matching commit to FF follows?\226?\128?\166


Modified: mediawiki/experimental/debian/patches/suppress_warnings.patch
===================================================================
--- mediawiki/experimental/debian/patches/suppress_warnings.patch	2012-07-26 13:42:49 UTC (rev 355)
+++ mediawiki/experimental/debian/patches/suppress_warnings.patch	2012-07-26 13:47:02 UTC (rev 356)
@@ -2,14 +2,31 @@
 
 Suppress warnings from being run within FusionForge’s gforge-plugin-mediawiki
 
---- mediawiki-1.19.0.orig/includes/GlobalFunctions.php
-+++ mediawiki-1.19.0/includes/GlobalFunctions.php
-@@ -3362,7 +3362,7 @@
- 		wfFixSessionID();
+--- a/includes/GlobalFunctions.php
++++ b/includes/GlobalFunctions.php
+@@ -2199,7 +2199,9 @@ function wfNegotiateType( $cprefs, $spre
+  *
+  * @param $end Bool
+  */
++$wf__warnings_suppressed = false;
+ function wfSuppressWarnings( $end = false ) {
++	global $wf__warnings_suppressed;
+ 	static $suppressCount = 0;
+ 	static $originalLevel = false;
+ 
+@@ -2208,6 +2210,7 @@ function wfSuppressWarnings( $end = fals
+ 			--$suppressCount;
+ 			if ( !$suppressCount ) {
+ 				error_reporting( $originalLevel );
++				$wf__warnings_suppressed = false;
+ 			}
+ 		}
+ 	} else {
+@@ -2217,6 +2220,7 @@ function wfSuppressWarnings( $end = fals
+ 				define( 'E_DEPRECATED', 8192 );
+ 			}
+ 			$originalLevel = error_reporting( E_ALL & ~( E_WARNING | E_NOTICE | E_USER_WARNING | E_USER_NOTICE | E_DEPRECATED ) );
++			$wf__warnings_suppressed = true;
+ 		}
+ 		++$suppressCount;
  	}
- 	wfSuppressWarnings();
--	session_start();
-+	@session_start();
- 	wfRestoreWarnings();
- }
-