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

[Thorsten Glaser]

Author: tg
Date: 2013-05-23 13:01:32 +0000 (Thu, 23 May 2013)
New Revision: 458

Added:
   mediawiki-extensions/trunk/debian/patches/fix_imagemap.patch
Modified:
   mediawiki-extensions/trunk/debian/changelog
   mediawiki-extensions/trunk/debian/patches/fix_graphviz.patch
   mediawiki-extensions/trunk/debian/patches/series
Log:
add some bugfixes and prepare for upload into sid


Modified: mediawiki-extensions/trunk/debian/changelog
===================================================================
--- mediawiki-extensions/trunk/debian/changelog	2013-05-23 12:57:16 UTC (rev 457)
+++ mediawiki-extensions/trunk/debian/changelog	2013-05-23 13:01:32 UTC (rev 458)
@@ -1,9 +1,11 @@
-mediawiki-extensions (3.3) UNRELEASED; urgency=low
+mediawiki-extensions (3.3) unstable; urgency=low
 
   * Upload to unstable
   * Bump Policy (no changes) and update VCS-* URLs like in mediawiki
+  * Fix XHTML output for ImageMap extension
+  * Make Graphviz extension not issue a warning with PHP 5.5
 
- -- Thorsten Glaser <tg at mirbsd.de>  Thu, 23 May 2013 14:39:25 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Thu, 23 May 2013 15:00:41 +0200
 
 mediawiki-extensions (3.2) experimental; urgency=medium
 
@@ -153,7 +155,7 @@
 mediawiki-extensions (2.1) unstable; urgency=low
 
   [ Christian Bayle ]
-  * Added fckeditor extension 
+  * Added fckeditor extension
 
   [ Romain Beauxis ]
   * Bumped standards version to 3.8.4
@@ -161,7 +163,7 @@
   * Fixed README.Debian
   Closes: #574277
   * New layout should fix openid update.
-  Closes: #571802 
+  Closes: #571802
   * First upload to sid.
 
  -- Romain Beauxis <toots at rastageeks.org>  Sat, 17 Apr 2010 11:29:00 -0500
@@ -174,9 +176,9 @@
       now shipped in its own package.
     o Added a metapackage that installs all available extensions.
       It also allows a proper backward compatibility.
-    o Extension files are now located in their own directory. 
+    o Extension files are now located in their own directory.
       A link is also provided to the mediawiki extensions/
-      directory, such that the extensions are installed 
+      directory, such that the extensions are installed
       as advised upstream.
     o Switched to branched extensions.
 
@@ -237,14 +239,14 @@
 
 mediawiki-extensions (1.1) unstable; urgency=low
 
-  * Updated extensions 
+  * Updated extensions
 
  -- Romain Beauxis <toots at rastageeks.org>  Sun, 04 Nov 2007 21:38:30 +0100
 
 mediawiki-extensions (1.0) unstable; urgency=low
 
   * More usefull package layout and build system.
-    Extensions can now be used without modifying 
+    Extensions can now be used without modifying
     includes..
   * Added two binaries mwenext and mwdisext to enable
     and disable extensions.
@@ -253,7 +255,7 @@
 
 mediawiki-extensions (0.9) unstable; urgency=low
 
-  * Updated all extensions to latest svn. 
+  * Updated all extensions to latest svn.
 
  -- Romain Beauxis <toots at rastageeks.org>  Tue, 24 Jul 2007 14:55:30 +0200
 
@@ -276,7 +278,7 @@
 
 mediawiki-extensions (0.6) unstable; urgency=high
 
-  * Corrected inclusion, closes: #425870 
+  * Corrected inclusion, closes: #425870
 
  -- Romain Beauxis <toots at rastageeks.org>  Thu, 24 May 2007 20:41:01 +0200
 

Modified: mediawiki-extensions/trunk/debian/patches/fix_graphviz.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_graphviz.patch	2013-05-23 12:57:16 UTC (rev 457)
+++ mediawiki-extensions/trunk/debian/patches/fix_graphviz.patch	2013-05-23 13:01:32 UTC (rev 458)
@@ -3,6 +3,7 @@
 Fix:
 * path to dot
 * XHTML/1.0 Transitional validity of output
+* PHP 5.5 compatibility
 
 --- a/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/GraphViz.php
 +++ b/dist/mediawiki-extensions-graphviz/usr/share/mediawiki-extensions/graphviz/GraphViz.php
@@ -29,7 +30,25 @@
  			}
  
  
-@@ -613,10 +614,10 @@ $wgExtensionCredits['parserhook'][] = ar
+@@ -458,13 +459,10 @@ $wgExtensionCredits['parserhook'][] = ar
+ 
+ 	function rewriteWikiUrls( &$source )
+ 	{
+-
+-		$line = preg_replace(
+-		'|\[\[([^]]+)\]\]|e',
+-		'Title::newFromText("$1")->getFullURL()',
+-		$source
+-		);
+-		return $line;
++		return preg_replace_callback('|\[\[([^]]+)\]\]|',
++		    create_function('$matches', '
++			return Title::newFromText($matches[1])->getFullURL();
++		    '), $source);
+ 	}
+ 
+ 	/**
+@@ -613,10 +611,10 @@ $wgExtensionCredits['parserhook'][] = ar
  		}
  
  		// Produce the basic html

Added: mediawiki-extensions/trunk/debian/patches/fix_imagemap.patch
===================================================================
--- mediawiki-extensions/trunk/debian/patches/fix_imagemap.patch	                        (rev 0)
+++ mediawiki-extensions/trunk/debian/patches/fix_imagemap.patch	2013-05-23 13:01:32 UTC (rev 458)
@@ -0,0 +1,16 @@
+$Id$
+
+Fix ImageMap extension:
+• invalid XHTML
+
+--- a/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/ImageMap/ImageMap_body.php
++++ b/dist/mediawiki-extensions-base/usr/share/mediawiki-extensions/base/ImageMap/ImageMap_body.php
+@@ -259,7 +259,7 @@ class ImageMap {
+ 			# Add random number to avoid breaking cached HTML fragments that are
+ 			# later joined together on the one page (bug 16471)
+ 			$mapName = "ImageMap_" . ++self::$id . '_' . mt_rand( 0, 0x7fffffff );
+-			$mapHTML = "<map name=\"$mapName\">\n$mapHTML</map>\n";
++			$mapHTML = "<map id=\"$mapName\" name=\"$mapName\">\n$mapHTML</map>\n";
+ 
+ 			# Alter the image tag
+ 			$imageNode->setAttribute( 'usemap', "#$mapName" );


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

Modified: mediawiki-extensions/trunk/debian/patches/series
===================================================================
--- mediawiki-extensions/trunk/debian/patches/series	2013-05-23 12:57:16 UTC (rev 457)
+++ mediawiki-extensions/trunk/debian/patches/series	2013-05-23 13:01:32 UTC (rev 458)
@@ -3,6 +3,7 @@
 fix_createbox.patch
 fix_footnote.patch
 fix_graphviz.patch
+fix_imagemap.patch
 fix_inputbox.patch
 fix_interwiki.patch
 fix_languageselector.patch