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

[Thorsten Glaser]

Author: tg
Date: 2012-12-17 14:40:13 +0000 (Mon, 17 Dec 2012)
New Revision: 408

Added:
   mediawiki/trunk/debian/patches/bz40889.patch
Modified:
   mediawiki/trunk/debian/changelog
Log:
add the missing changelog entries, and a missing patch
(note: all patches committed were tested, though against 1.19.2,
over several weeks on several VMs totalling over 280 wikis in
production at tarent solutions GmbH, Questor GmbH, OSIAM GmbH
and tarent AG)


Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2012-12-16 20:46:20 UTC (rev 407)
+++ mediawiki/trunk/debian/changelog	2012-12-17 14:40:13 UTC (rev 408)
@@ -1,5 +1,19 @@
+mediawiki (1:1.19.3-2) UNRELEASED; urgency=low
+
+  * Add missing changelog entries to 1:1.19.3-1 upload (oops…)
+  * Upstream patch to fix XHTML issue in Special:Upload (BZ#40889)
+
+ -- Thorsten Glaser <t.glaser at tarent.de>  Mon, 17 Dec 2012 15:38:30 +0100
+
 mediawiki (1:1.19.3-1) unstable; urgency=high
 
+  [ Thorsten Glaser ]
+  * Note: these changes were part of this upload, even though
+    they were not detailed in this changelog entry when uploading:
+  * <img> tags must always have an alt attribute
+  * fix DB upgrade FUBAR issue for PostgreSQL (BZ#29635)
+  * allow MySQL users to choose either PHP5 client library (Closes: #689758)
+
   [ Dominik George ]
   * Team upload
   * New upstream version fixes security issues (Closes: #694998)

Added: mediawiki/trunk/debian/patches/bz40889.patch
===================================================================
--- mediawiki/trunk/debian/patches/bz40889.patch	                        (rev 0)
+++ mediawiki/trunk/debian/patches/bz40889.patch	2012-12-17 14:40:13 UTC (rev 408)
@@ -0,0 +1,30 @@
+From 6f1d4db3e1e2bba4f204b44ee10cc8f87a2e1238 Mon Sep 17 00:00:00 2001
+From: Mark Holmquist <mtraceur at member.fsf.org>
+Date: Sat, 13 Oct 2012 16:33:50 -0700
+Subject: [PATCH] (bug 40889) Fix XHTML in Special:Upload form labels
+
+We were using an improper method for adding labels to the form, namely
+using something other than the ID (and in fact, a nonexistent ID) in the
+'for' attribute. This patch uses the ID of the parent element and should
+fix the issue.
+
+Note: Upstream bug in Firefox prevents testing this patch in that browser.
+Use Chromium, as the FF bug report says that it works there. See
+https://bugzilla.mozilla.org/show_bug.cgi?id=701353 for more.
+
+Change-Id: I19e06a3b94f67f364d129cbef4ecc232f108e82d
+---
+ includes/specials/SpecialUpload.php |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+--- a/includes/specials/SpecialUpload.php
++++ b/includes/specials/SpecialUpload.php
+@@ -1116,7 +1116,7 @@ class UploadSourceField extends HTMLText
+ 	 * @return string
+ 	 */
+ 	function getLabelHtml( $cellAttributes = array() ) {
+-		$id = "wpSourceType{$this->mParams['upload-type']}";
++		$id = $this->mParams['id'];
+ 		$label = Html::rawElement( 'label', array( 'for' => $id ), $this->mLabel );
+ 
+ 		if ( !empty( $this->mParams['radio'] ) ) {