Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 33 insertions, 11 deletions

diff --git a/extensions/ImageMap/ImageMap.php b/extensions/ImageMap/ImageMap.php
index aa4cfa0d..081eeaa6 100644
--- a/extensions/ImageMap/ImageMap.php
+++ b/extensions/ImageMap/ImageMap.php
@@ -1,17 +1,39 @@
 <?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';
 
-$dir = __DIR__ . '/';
-$wgExtensionMessagesFiles['ImageMap'] = $dir . 'ImageMap.i18n.php';
-$wgAutoloadClasses['ImageMap'] = $dir . 'ImageMap_body.php';
-$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',
+	);
 
-$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