[Pkg-mediawiki-commits] r354 - in mediawiki-extensions/experimental/debian: . patches

[Thorsten Glaser]

Author: tg
Date: 2012-07-26 13:39:58 +0000 (Thu, 26 Jul 2012)
New Revision: 354

Added:
   mediawiki-extensions/experimental/debian/patches/fix_inputbox.patch
Modified:
   mediawiki-extensions/experimental/debian/changelog
   mediawiki-extensions/experimental/debian/patches/series
Log:
next patch, and sort debian/patches/series ASCIIbetically


Modified: mediawiki-extensions/experimental/debian/changelog
===================================================================
--- mediawiki-extensions/experimental/debian/changelog	2012-07-26 13:24:12 UTC (rev 353)
+++ mediawiki-extensions/experimental/debian/changelog	2012-07-26 13:39:58 UTC (rev 354)
@@ -1,8 +1,9 @@
-mediawiki-extensions (3~0~1) experimental; urgency=low
+mediawiki-extensions (3~0~2) experimental; urgency=low
 
   * Fix content-less ul element in Collection extension
+  * Fix invalid XHTML in InputBox extension
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Thu, 26 Jul 2012 15:12:51 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Thu, 26 Jul 2012 15:39:30 +0200
 
 mediawiki-extensions (2.7) unstable; urgency=low
 

Added: mediawiki-extensions/experimental/debian/patches/fix_inputbox.patch
===================================================================
--- mediawiki-extensions/experimental/debian/patches/fix_inputbox.patch	                        (rev 0)
+++ mediawiki-extensions/experimental/debian/patches/fix_inputbox.patch	2012-07-26 13:39:58 UTC (rev 354)
@@ -0,0 +1,100 @@
+$Id$
+
+Fix InputBox extension:
+• Invalid XHTML
+
+--- a/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/InputBox/InputBox.classes.php
++++ b/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/InputBox/InputBox.classes.php
+@@ -74,6 +74,7 @@ class InputBox {
+ 	 */
+ 	public function getSearchForm( $type ) {
+ 		global $wgContLang, $wgNamespaceAliases;
++		global $wgHtml5;
+ 
+ 		// Use button label fallbacks
+ 		if ( !$this->mButtonLabel ) {
+@@ -98,15 +99,19 @@ class InputBox {
+ 				'action' => SpecialPage::getTitleFor( 'Search' )->escapeLocalUrl(),
+ 			)
+ 		);
+-		$htmlOut .= Xml::element( 'input',
+-			array(
++		$tmpa = array(
+ 				'class' => 'searchboxInput',
+ 				'name' => 'search',
+ 				'type' => $this->mHidden ? 'hidden' : 'text',
+ 				'value' => $this->mDefaultText,
+ 				'placeholder' => $this->mPlaceholderText,
+ 				'size' => $this->mWidth,
+-			)
++			);
++		if (!$wgHtml5) {
++			unset($tmpa['placeholder']);
++		}
++		$htmlOut .= Xml::element( 'input',
++			$tmpa
+ 		);
+ 
+ 		if( $this->mPrefix != '' ){
+@@ -302,6 +307,7 @@ class InputBox {
+ 	 */
+ 	public function getCreateForm() {
+ 		global $wgScript;
++		global $wgHtml5;
+ 
+ 		if ( $this->mType == "comment" ) {
+ 			if ( !$this->mButtonLabel ) {
+@@ -387,15 +393,19 @@ class InputBox {
+ 				)
+ 			);
+ 		}
+-		$htmlOut .= Xml::openElement( 'input',
+-			array(
++		$tmpa = array(
+ 				'type' => $this->mHidden ? 'hidden' : 'text',
+ 				'name' => 'title',
+ 				'class' => 'createboxInput',
+ 				'value' => $this->mDefaultText,
+ 				'placeholder' => $this->mPlaceholderText,
+ 				'size' => $this->mWidth
+-			)
++			);
++		if (!$wgHtml5) {
++			unset($tmpa['placeholder']);
++		}
++		$htmlOut .= Xml::openElement( 'input',
++			$tmpa
+ 		);
+ 		$htmlOut .= $this->mBR;
+ 		$htmlOut .= Xml::openElement( 'input',
+@@ -418,6 +428,7 @@ class InputBox {
+ 	 */
+ 	public function getCommentForm() {
+ 		global $wgScript;
++		global $wgHtml5;
+ 
+ 		if ( !$this->mButtonLabel ) {
+ 				$this->mButtonLabel = wfMsgHtml( "postcomment" );
+@@ -460,15 +471,19 @@ class InputBox {
+ 				'value' => $this->mEditIntro,
+ 			)
+ 		);
+-		$htmlOut .= Xml::openElement( 'input',
+-			array(
++		$tmpa = array(
+ 				'type' => $this->mHidden ? 'hidden' : 'text',
+ 				'name' => 'preloadtitle',
+ 				'class' => 'commentboxInput',
+ 				'value' => $this->mDefaultText,
+ 				'placeholder' => $this->mPlaceholderText,
+ 				'size' => $this->mWidth
+-			)
++			);
++		if (!$wgHtml5) {
++			unset($tmpa['placeholder']);
++		}
++		$htmlOut .= Xml::openElement( 'input',
++			$tmpa
+ 		);
+ 		$htmlOut .= Xml::openElement( 'input',
+ 			array(


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

Modified: mediawiki-extensions/experimental/debian/patches/series
===================================================================
--- mediawiki-extensions/experimental/debian/patches/series	2012-07-26 13:24:12 UTC (rev 353)
+++ mediawiki-extensions/experimental/debian/patches/series	2012-07-26 13:39:58 UTC (rev 354)
@@ -1,10 +1,11 @@
 fix_472283.patch
 fix_collection.patch
+fix_createbox.patch
 fix_fckeditor.patch
+fix_footnote.patch
 fix_graphviz.patch
-fix_createbox.patch
-fix_footnote.patch
+fix_inputbox.patch
+fix_interwiki.patch
 fix_languageselector.patch
 fix_rssreader.patch
-fix_interwiki.patch
 news_dont_break_feeds.patch