[Pkg-mediawiki-commits] r202 - in mediawiki/trunk/debian: . patches

[Thorsten Glaser]

Author: tg
Date: 2010-07-28 09:53:24 +0000 (Wed, 28 Jul 2010)
New Revision: 202

Added:
   mediawiki/trunk/debian/patches/suppress_warnings.patch
Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/patches/series
Log:
add patch to suppress a warning about session_start() being called
twice in the PHP error log (MediaWiki?\226?\128?\153s was already suppressed in
the surrounding code) as well


Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2010-07-16 15:07:28 UTC (rev 201)
+++ mediawiki/trunk/debian/changelog	2010-07-28 09:53:24 UTC (rev 202)
@@ -1,3 +1,11 @@
+mediawiki (1:1.15.4-3) UNRELEASED; urgency=low
+
+  * debian/patches/suppress_warnings.patch: new, suppress warnings
+    about session_start() being called twice also in the PHP error
+    log, not just MediaWiki’s, for example run from FusionForge
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 28 Jul 2010 11:51:44 +0200
+
 mediawiki (1:1.15.4-2) unstable; urgency=low
 
   [ Thorsten Glaser ]

Modified: mediawiki/trunk/debian/patches/series
===================================================================
--- mediawiki/trunk/debian/patches/series	2010-07-16 15:07:28 UTC (rev 201)
+++ mediawiki/trunk/debian/patches/series	2010-07-28 09:53:24 UTC (rev 202)
@@ -4,3 +4,4 @@
 detect_invalid_titles.patch
 add_rss_guid.patch
 backup_documentation.patch
+suppress_warnings.patch

Added: mediawiki/trunk/debian/patches/suppress_warnings.patch
===================================================================
--- mediawiki/trunk/debian/patches/suppress_warnings.patch	                        (rev 0)
+++ mediawiki/trunk/debian/patches/suppress_warnings.patch	2010-07-28 09:53:24 UTC (rev 202)
@@ -0,0 +1,16 @@
+$Id$
+
+Suppress warnings from being run within FusionForge’s gforge-plugin-mediawiki
+
+diff -pruN mediawiki-1.15.4~/includes/GlobalFunctions.php mediawiki-1.15.4/includes/GlobalFunctions.php
+--- mediawiki-1.15.4~/includes/GlobalFunctions.php	2009-03-25 03:07:09.000000000 +0100
++++ mediawiki-1.15.4/includes/GlobalFunctions.php	2010-07-28 11:46:06.000000000 +0200
+@@ -2678,7 +2678,7 @@ function wfSetupSession() {
+ 	}
+ 	session_cache_limiter( 'private, must-revalidate' );
+ 	wfSuppressWarnings();
+-	session_start();
++	@session_start();
+ 	wfRestoreWarnings();
+ }
+ 


Property changes on: mediawiki/trunk/debian/patches/suppress_warnings.patch
___________________________________________________________________
Added: svn:keywords
   + Author CVSHeader Date Id LastChangedBy LastChangedDate LastChangedRevision Log Revision Source State