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

[Thorsten Glaser]

Author: tg
Date: 2012-07-26 14:13:43 +0000 (Thu, 26 Jul 2012)
New Revision: 359

Modified:
   mediawiki/experimental/debian/patches/fix_warnings.patch
Log:
huh, unserialize() with input syntax error doesn?\226?\128?\153t like to be easily quietened


Modified: mediawiki/experimental/debian/patches/fix_warnings.patch
===================================================================
--- mediawiki/experimental/debian/patches/fix_warnings.patch	2012-07-26 14:06:32 UTC (rev 358)
+++ mediawiki/experimental/debian/patches/fix_warnings.patch	2012-07-26 14:13:43 UTC (rev 359)
@@ -2,10 +2,11 @@
 
 Fix code:
 • array_merge expects at least one argument
+• apparently, checking for syntax with unserialize() needs an extra
 
 --- a/includes/SkinTemplate.php
 +++ b/includes/SkinTemplate.php
-@@ -1801,7 +1801,7 @@ abstract class BaseTemplate extends Quic
+@@ -1808,7 +1808,7 @@ abstract class BaseTemplate extends Quic
  			}
  		}
  
@@ -14,3 +15,14 @@
  			// fold footerlinks into a single array using a bit of trickery
  			$validFooterLinks = call_user_func_array(
  				'array_merge',
+--- a/includes/media/PNG.php
++++ b/includes/media/PNG.php
+@@ -78,7 +78,7 @@ class PNGHandler extends BitmapHandler {
+ 		}
+ 
+ 		wfSuppressWarnings();
+-		$data = unserialize( $metadata );
++		$data = @unserialize( $metadata );
+ 		wfRestoreWarnings();
+ 
+ 		if ( !$data || !is_array( $data ) ) {