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

[Thorsten Glaser]

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

Added:
   mediawiki/experimental/debian/patches/fix_warnings.patch
Modified:
   mediawiki/experimental/debian/patches/series
Log:
add another bugfix


Added: mediawiki/experimental/debian/patches/fix_warnings.patch
===================================================================
--- mediawiki/experimental/debian/patches/fix_warnings.patch	                        (rev 0)
+++ mediawiki/experimental/debian/patches/fix_warnings.patch	2012-07-26 13:54:47 UTC (rev 357)
@@ -0,0 +1,16 @@
+$Id$
+
+Fix code:
+• array_merge expects at least one argument
+
+--- a/includes/SkinTemplate.php
++++ b/includes/SkinTemplate.php
+@@ -1801,7 +1801,7 @@ abstract class BaseTemplate extends Quic
+ 			}
+ 		}
+ 
+-		if ( $option == 'flat' ) {
++		if ( $option == 'flat' && $validFooterLinks ) {
+ 			// fold footerlinks into a single array using a bit of trickery
+ 			$validFooterLinks = call_user_func_array(
+ 				'array_merge',


Property changes on: mediawiki/experimental/debian/patches/fix_warnings.patch
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: mediawiki/experimental/debian/patches/series
===================================================================
--- mediawiki/experimental/debian/patches/series	2012-07-26 13:47:02 UTC (rev 356)
+++ mediawiki/experimental/debian/patches/series	2012-07-26 13:54:47 UTC (rev 357)
@@ -2,3 +2,4 @@
 suppress_warnings.patch
 fix_invalid_sql.patch
 fix_invalid_xhtml.patch
+fix_warnings.patch