Update to MediaWiki 1.25.1

1 files changed, 10 insertions, 41 deletions

diff --git a/extensions/ImageMap/ImageMap.php b/extensions/ImageMap/ImageMap.php
index 081eeaa6..71b9d9b2 100644
--- a/extensions/ImageMap/ImageMap.php
+++ b/extensions/ImageMap/ImageMap.php
@@ -1,45 +1,14 @@
 <?php
-/**
- * ImageMap extension - Allows clickable HTML image maps.
- *
- * @link https://www.mediawiki.org/wiki/Extension:ImageMap Documentation
- *
- * @file
- * @ingroup Extensions
- * @package MediaWiki
- * @author Tim Starling
- * @copyright (C) 2007 Tim Starling
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
- */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-   die( 'This file is a MediaWiki extension, it is not a valid entry point' );
-}
-
-//self executing anonymous function to prevent global scope assumptions
-call_user_func( function() {
-	$dir = __DIR__ . '/';
-	$GLOBALS['wgMessagesDirs']['ImageMap'] = __DIR__ . '/i18n';
-	$GLOBALS['wgExtensionMessagesFiles']['ImageMap'] = $dir . 'ImageMap.i18n.php';
-	$GLOBALS['wgAutoloadClasses']['ImageMap'] = $dir . 'ImageMap_body.php';
-	$GLOBALS['wgHooks']['ParserFirstCallInit'][] = 'wfSetupImageMap';
-
-	$GLOBALS['wgExtensionCredits']['parserhook']['ImageMap'] = array(
-		'path'           => __FILE__,
-		'name'           => 'ImageMap',
-		'author'         => 'Tim Starling',
-		'url'            => 'https://www.mediawiki.org/wiki/Extension:ImageMap',
-		'descriptionmsg' => 'imagemap_desc',
-	);
-
-	$GLOBALS['wgParserTestFiles'][] = $dir . 'imageMapParserTests.txt';
-} );
-
-/**
- * @param $parser Parser
- * @return bool
- */
-function wfSetupImageMap( &$parser ) {
-	$parser->setHook( 'imagemap', array( 'ImageMap', 'render' ) );
+if ( function_exists( 'wfLoadExtension' ) ) {
+	wfLoadExtension( 'ImageMap' );
+	// Keep i18n globals so mergeMessageFileList.php doesn't break
+	$wgMessagesDirs['ImageMap'] = __DIR__ . '/i18n';
+	/* wfWarn(
+		'Deprecated PHP entry point used for ImageMap extension. Please use wfLoadExtension instead, ' .
+		'see https://www.mediawiki.org/wiki/Extension_registration for more details.'
+	); */
 	return true;
+} else {
+	die( 'This version of the ImageMap extension requires MediaWiki 1.25+' );
 }