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

[Thorsten Glaser]

Author: tg
Date: 2010-06-30 15:02:21 +0000 (Wed, 30 Jun 2010)
New Revision: 198

Added:
   mediawiki-extensions/trunk/debian/patches/fix_createbox.patch
   mediawiki-extensions/trunk/debian/patches/fix_footnote.patch
Modified:
   mediawiki-extensions/trunk/debian/changelog
   mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch
   mediawiki-extensions/trunk/debian/patches/series
Log:
quelle surprise, more fixes
?\226?\128?\162 PHP 5.3 / MW API (reference stuff)
?\226?\128?\162 MW 1.16 stuff


Modified: mediawiki-extensions/trunk/debian/changelog
===================================================================
--- mediawiki-extensions/trunk/debian/changelog	2010-06-30 14:35:17 UTC (rev 197)
+++ mediawiki-extensions/trunk/debian/changelog	2010-06-30 15:02:21 UTC (rev 198)
@@ -18,8 +18,8 @@
   * debian/copyright: add information for new extensions
   * Remove all mentions of SpecialLastUserLogin because
     it is not included (any more?) in the package
-  * Make buggy extensions (LanguageSelector, NewestPages,
-    RSS_Reader) work and PHP 5.3 compatible by patching
+  * Make buggy extensions (CreateBox, FootNote, LanguageSelector,
+    NewestPages, RSS_Reader) work and PHP 5.3 compatible by patching
   * Replace embedded JQuery and JQueryUI code copies from
     Collection with links to the Debian packages thereof
   * Bump Standards-Version to 3.9.0.0
@@ -27,7 +27,7 @@
   * Fix Lintian warnings
   * Correct path to the dot command in GraphViz extension
 
- -- Thorsten Glaser <tg at mirbsd.de>  Wed, 30 Jun 2010 16:34:53 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 30 Jun 2010 17:01:03 +0200
 
 mediawiki-extensions (2.2) unstable; urgency=high
 

Added: mediawiki-extensions/trunk/debian/patches/fix_createbox.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_createbox.patch	                        (rev 0)
+++ mediawiki-extensions/trunk/debian/patches/fix_createbox.patch	2010-06-30 15:02:21 UTC (rev 198)
@@ -0,0 +1,18 @@
+$Id$
+
+Fix CreateBox extension:
+* API impropriety
+
+Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php
+===================================================================
+--- trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php	(revision 196)
++++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/CreateBox/CreateBox.php	(working copy)
+@@ -91,7 +91,7 @@
+ 	return $value;
+ }
+ 
+-function acMakeBox( $input, $argv, &$parser ) {
++function acMakeBox( $input, $argv, $parser ) {
+ 	wfLoadExtensionMessages( 'CreateBox' );
+ 	global $wgRequest, $wgScript;
+ 	if( $wgRequest->getVal( 'action' ) == 'create' ) {


Property changes on: mediawiki-extensions/trunk/debian/patches/fix_createbox.patch
___________________________________________________________________
Added: svn:keywords
   + Author CVSHeader Date Id LastChangedBy LastChangedDate LastChangedRevision Log Revision Source State

Added: mediawiki-extensions/trunk/debian/patches/fix_footnote.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_footnote.patch	                        (rev 0)
+++ mediawiki-extensions/trunk/debian/patches/fix_footnote.patch	2010-06-30 15:02:21 UTC (rev 198)
@@ -0,0 +1,18 @@
+$Id$
+
+Fix FootNote extension:
+* API impropriety
+
+Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php
+===================================================================
+--- trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php	(revision 196)
++++ trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/FootNote/Footnote.php	(working copy)
+@@ -71,7 +71,7 @@
+ 	return true;
+ }
+ 
+-function parse_footnote( $text, $params, &$parser ) {
++function parse_footnote( $text, $params, $parser ) {
+ 	$ret = "" ;
+ 
+ 	global $footnoteNotes , $footnoteCount, $footnoteRecursionGuard ;


Property changes on: mediawiki-extensions/trunk/debian/patches/fix_footnote.patch
___________________________________________________________________
Added: svn:keywords
   + Author CVSHeader Date Id LastChangedBy LastChangedDate LastChangedRevision Log Revision Source State

Modified: mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch	2010-06-30 14:35:17 UTC (rev 197)
+++ mediawiki-extensions/trunk/debian/patches/fix_languageselector.patch	2010-06-30 15:02:21 UTC (rev 198)
@@ -2,10 +2,25 @@
 
 Fix LanguageSelector extension:
 * API impropriety
+* $wgExtensionAssetsPath is new in MW 1.16
 
---- mediawiki-extensions-2.3/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php~	2010-06-29 09:49:00.000000000 +0200
-+++ mediawiki-extensions-2.3/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php	2010-06-29 14:52:52.000000000 +0200
-@@ -200,7 +200,7 @@ function wfLanguageSelectorBeforePageDis
+Index: trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php
+===================================================================
+--- trunk/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/LanguageSelector/LanguageSelector.php	(revision 196)
++++ trunk/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;
  }
  

Modified: mediawiki-extensions/trunk/debian/patches/series
===================================================================
--- mediawiki-extensions/trunk/debian/patches/series	2010-06-30 14:35:17 UTC (rev 197)
+++ mediawiki-extensions/trunk/debian/patches/series	2010-06-30 15:02:21 UTC (rev 198)
@@ -1,5 +1,7 @@
 fix_472283.patch
+fix_createbox.patch
 fix_fckeditor.patch
+fix_footnote.patch
 fix_graphviz.patch
 fix_languageselector.patch
 fix_newestpages.patch