[evolvis-commits] r18728: another XHTML validity fix, this one from upstream

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Oct 15 15:53:03 CEST 2012


Author: mirabilos
Date: 2012-10-15 15:53:02 +0200 (Mon, 15 Oct 2012)
New Revision: 18728

Added:
   trunk/mediawiki/debian/patches/bz40889.patch
Modified:
   trunk/mediawiki/debian/changelog
   trunk/mediawiki/debian/patches/series
Log:
another XHTML validity fix, this one from upstream

Modified: trunk/mediawiki/debian/changelog
===================================================================
--- trunk/mediawiki/debian/changelog	2012-10-09 12:33:15 UTC (rev 18727)
+++ trunk/mediawiki/debian/changelog	2012-10-15 13:53:02 UTC (rev 18728)
@@ -1,3 +1,9 @@
+mediawiki (1:1.19.2-2tarent3) unstable; urgency=low
+
+  * Upstream patch to fix XHTML issue in Special:Upload (BZ#40889)
+
+ -- Thorsten Glaser <t.glaser at tarent.de>  Mon, 15 Oct 2012 15:51:41 +0200
+
 mediawiki (1:1.19.2-2tarent2) unstable; urgency=low
 
   { issues committed in pkg-mediawiki already }

Added: trunk/mediawiki/debian/patches/bz40889.patch
===================================================================
--- trunk/mediawiki/debian/patches/bz40889.patch	                        (rev 0)
+++ trunk/mediawiki/debian/patches/bz40889.patch	2012-10-15 13:53:02 UTC (rev 18728)
@@ -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'] ) ) {

Modified: trunk/mediawiki/debian/patches/series
===================================================================
--- trunk/mediawiki/debian/patches/series	2012-10-09 12:33:15 UTC (rev 18727)
+++ trunk/mediawiki/debian/patches/series	2012-10-15 13:53:02 UTC (rev 18728)
@@ -4,4 +4,5 @@
 fix_invalid_xhtml.patch
 fix_warnings.patch
 bz29635.patch
+bz40889.patch
 tarent.patch



More information about the evolvis-commits mailing list