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

[Thorsten Glaser]

Author: tg
Date: 2010-08-12 09:42:06 +0000 (Thu, 12 Aug 2010)
New Revision: 223

Modified:
   mediawiki-extensions/trunk/debian/changelog
   mediawiki-extensions/trunk/debian/patches/fix_createbox.patch
   mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch
Log:
now refresh patches

XXX this should be considered for squeeze
(but I want to test it in a live environment for a while first)


Modified: mediawiki-extensions/trunk/debian/changelog
===================================================================
--- mediawiki-extensions/trunk/debian/changelog	2010-08-12 09:32:13 UTC (rev 222)
+++ mediawiki-extensions/trunk/debian/changelog	2010-08-12 09:42:06 UTC (rev 223)
@@ -2,8 +2,10 @@
 
   * Fix a few extensions’ bugs to achieve XHTML validity
   * Make id attributes unique in RSS_Reader and fix warnings
+  * Switch extension sources from trunk or 1.15.3 branch
+    to 1.15.5 branch; refresh patches
 
- -- Thorsten Glaser <tg at mirbsd.de>  Wed, 28 Jul 2010 12:40:18 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Thu, 12 Aug 2010 11:41:11 +0200
 
 mediawiki-extensions (2.3) unstable; urgency=low
 

Modified: mediawiki-extensions/trunk/debian/patches/fix_createbox.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_createbox.patch	2010-08-12 09:32:13 UTC (rev 222)
+++ mediawiki-extensions/trunk/debian/patches/fix_createbox.patch	2010-08-12 09:42:06 UTC (rev 223)
@@ -4,23 +4,23 @@
 * API impropriety
 * XHTML/1.0 Transitional validity of output
 
-Index: mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php
+Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php
 ===================================================================
---- mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php	(revision 200)
-+++ mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php	(working copy)
-@@ -91,7 +91,7 @@
- 	return $value;
+--- trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php	(revision 222)
++++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php	(working copy)
+@@ -90,7 +90,7 @@
+     return $value;
  }
  
--function acMakeBox( $input, $argv, &$parser ) {
-+function acMakeBox( $input, $argv, $parser ) {
- 	wfLoadExtensionMessages( 'CreateBox' );
- 	global $wgRequest, $wgScript;
- 	if( $wgRequest->getVal( 'action' ) == 'create' ) {
-@@ -113,15 +113,13 @@
- 	$br = ( ( acGetOption( $input, 'break', 'no' ) == 'no' ) ? '' : '<br />' );
- 	$label = acGetOption( $input, 'buttonlabel', wfMsgHtml( 'createbox-create' ) );
- 	$output = <<<ENDFORM
+-function acMakeBox($input, $argv, &$parser) {
++function acMakeBox($input, $argv, $parser) {
+ 	wfLoadExtensionMessages('CreateBox');
+     global $wgRequest, $wgScript;
+     if($wgRequest->getVal('action')=='create') {
+@@ -112,15 +112,13 @@
+     $br = ((acGetOption($input, 'break', 'no')=='no') ? '' : '<br />');
+     $label = acGetOption($input, 'buttonlabel', wfMsgHtml('createbox-create'));
+     $output=<<<ENDFORM
 -<div class="createbox" align="{$align}">
 -<form name="createbox" action="{$submit}" method="get" class="createboxForm">
 -<input type='hidden' name="action" value="create">
@@ -34,5 +34,5 @@
 -</form></div>
 +<input type='submit' name="create" class="createboxButton" value="{$label}"/></form></div>
  ENDFORM;
- 	return $parser->replaceVariables( $output );
+     return $parser->replaceVariables($output);
  }

Modified: mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch	2010-08-12 09:32:13 UTC (rev 222)
+++ mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch	2010-08-12 09:42:06 UTC (rev 223)
@@ -1,50 +1,27 @@
 $Id$
 
 Fix LanguageSelector extension:
-* API impropriety
-* $wgExtensionAssetsPath is new in MW 1.16
 * XHTML/1.0 Transitional validity of output
 
-Index: mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php
+Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php
 ===================================================================
---- mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php	(revision 200)
-+++ mwe/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php	(working copy)
-@@ -185,6 +185,11 @@
- function wfLanguageSelectorBeforePageDisplay( &$out ) {
- 	global $wgExtensionAssetsPath, $wgLanguageSelectorLocation, $wgLanguageSelectorFormUsed;
- 
-+	if (!isset($wgExtensionAssetsPath)) {
-+		global $wgScriptPath;
-+		$wgExtensionAssetsPath = "$wgScriptPath/extensions";
-+	}
-+
- 	if ( $wgLanguageSelectorLocation == LANGUAGE_SELECTOR_AT_TOP_OF_TEXT ) {
- 		$html = wfLanguageSelectorHTML();
- 		$out->mBodytext = $html . $out->mBodytext;
-@@ -200,7 +205,7 @@
- 	return true;
- }
- 
--function wfLanguageSelectorGetCacheVaryCookies( &$cookies ) {
-+function wfLanguageSelectorGetCacheVaryCookies( $out, &$cookies ) {
- 	global $wgCookiePrefix;
- 
- 	$cookies[] = $wgCookiePrefix.'LanguageSelectorLanguage';
-@@ -396,7 +401,7 @@
+--- trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php	(revision 222)
++++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php	(working copy)
+@@ -351,7 +351,7 @@
  	$code = $wgLang->getCode();
  
  	$html = '';
--	$html .= Xml::openElement( 'span', array(
-+	$html .= Xml::openElement( 'div', array(
- 		'id' => 'languageselector-box-' . $id,
- 		'class' => 'languageselector ' . $class,
- 		'style' => $style
-@@ -426,7 +431,7 @@
- 	$html .= Xml::submitButton( wfMsg( 'languageselector-setlang' ),
- 		array( 'id' => 'languageselector-commit-' . $id, 'style' => $buttonstyle ) );
- 	$html .= Xml::closeElement( 'form' );
--	$html .= Xml::closeElement( 'span' );
-+	$html .= Xml::closeElement( 'div' );
+-	$html .= Xml::openElement('span', array('id' => 'languageselector-box-'.$id, 'class' => 'languageselector ' . $class, 'style' => $style ));
++	$html .= Xml::openElement('div', array('id' => 'languageselector-box-'.$id, 'class' => 'languageselector ' . $class, 'style' => $style ));
+ 	$html .= Xml::openElement('form', array('name' => 'languageselector-form-'.$id, 'id' => 'languageselector-form-'.$id, 'method' => 'get', 'action' => $wgScript, 'style' => 'display:inline;'));
+ 	$html .= Xml::hidden( 'title', $wgTitle->getPrefixedDBKey() );
+ 	$html .= Xml::openElement('select', array('name' => 'setlang', 'id' => 'languageselector-select-'.$id, 'style' => $selectorstyle));
+@@ -363,7 +363,7 @@
+ 	$html .= Xml::closeElement('select');
+ 	$html .= Xml::submitButton(wfMsg('languageselector-setlang'), array( 'id' => 'languageselector-commit-'.$id, 'style' => $buttonstyle ));
+ 	$html .= Xml::closeElement('form');
+-	$html .= Xml::closeElement('span');
++	$html .= Xml::closeElement('div');
  
  	return $html;
  }