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

[Thorsten Glaser]

Author: tg
Date: 2013-09-04 15:28:18 +0000 (Wed, 04 Sep 2013)
New Revision: 473

Added:
   mediawiki/trunk/debian/patches/fix_variable_use.patch
Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/patches/bz40889.patch
   mediawiki/trunk/debian/patches/series
Log:
pull upstream bugfix patch; sort and refresh patches


Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2013-09-04 15:23:12 UTC (rev 472)
+++ mediawiki/trunk/debian/changelog	2013-09-04 15:28:18 UTC (rev 473)
@@ -8,8 +8,10 @@
   * Allow PDF upload (Closes: #716957)
   * Nuke ref to ENOENT dir (Closes: #705107)
   * Update debian/copyright information
+  * Pull upstream patch to fix variables (Closes: #709943)
+  * Sort patches ASCIIbetically; refresh them against new version
 
- -- Thorsten Glaser <tg at mirbsd.de>  Wed, 04 Sep 2013 17:22:26 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 04 Sep 2013 17:26:52 +0200
 
 mediawiki (1:1.19.7+dfsg-1) unstable; urgency=low
 

Modified: mediawiki/trunk/debian/patches/bz40889.patch
===================================================================
--- mediawiki/trunk/debian/patches/bz40889.patch	2013-09-04 15:23:12 UTC (rev 472)
+++ mediawiki/trunk/debian/patches/bz40889.patch	2013-09-04 15:28:18 UTC (rev 473)
@@ -19,7 +19,7 @@
 
 --- a/includes/specials/SpecialUpload.php
 +++ b/includes/specials/SpecialUpload.php
-@@ -1116,7 +1116,7 @@ class UploadSourceField extends HTMLText
+@@ -1115,7 +1115,7 @@ class UploadSourceField extends HTMLText
  	 * @return string
  	 */
  	function getLabelHtml( $cellAttributes = array() ) {

Added: mediawiki/trunk/debian/patches/fix_variable_use.patch
===================================================================
--- mediawiki/trunk/debian/patches/fix_variable_use.patch	                        (rev 0)
+++ mediawiki/trunk/debian/patches/fix_variable_use.patch	2013-09-04 15:28:18 UTC (rev 473)
@@ -0,0 +1,28 @@
+From fc072f2dfcc92095e9f9e558327e001208a70f35 Mon Sep 17 00:00:00 2001
+From: Liangent <liangent at gmail.com>
+Date: Mon, 26 Mar 2012 21:36:24 +0800
+Subject: [PATCH] Was causing Notice: Array to string conversion in
+ .../includes/api/ApiBase.php on line 285 and examples of list=allimages are
+ not displayed properly
+
+Change-Id: I4fde14245ac19716957beb634a274c3a6042d776
+---
+ includes/api/ApiBase.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/includes/api/ApiBase.php
++++ b/includes/api/ApiBase.php
+@@ -280,12 +280,12 @@ abstract class ApiBase extends ContextSo
+ 					if ( is_numeric( $k ) ) {
+ 						$msg .= "  $v\n";
+ 					} else {
+-						$v .= ":";
+ 						if ( is_array( $v ) ) {
+ 							$msgExample = implode( "\n", array_map( array( $this, 'indentExampleText' ), $v ) );
+ 						} else {
+ 							$msgExample = "  $v";
+ 						}
++						$msgExample .= ":";
+ 						$msg .= wordwrap( $msgExample, 100, "\n" ) . "\n    $k\n";
+ 					}
+ 				}

Modified: mediawiki/trunk/debian/patches/series
===================================================================
--- mediawiki/trunk/debian/patches/series	2013-09-04 15:23:12 UTC (rev 472)
+++ mediawiki/trunk/debian/patches/series	2013-09-04 15:28:18 UTC (rev 473)
@@ -1,10 +1,11 @@
-mimetypes.patch
-suppress_warnings.patch
+allow_pdf.patch
+bz29635.patch
+bz39635.patch
+bz40889.patch
+debian_specific_config.patch
 fix_invalid_sql.patch
 fix_invalid_xhtml.patch
+fix_variable_use.patch
 fix_warnings.patch
-bz29635.patch
-bz40889.patch
-bz39635.patch
-debian_specific_config.patch
-allow_pdf.patch
+mimetypes.patch
+suppress_warnings.patch