Update to MediaWiki 1.24.2

2 files changed, 4 insertions, 14 deletions

diff --git a/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php b/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
index 6d1f73c7..3580d013 100644
--- a/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
+++ b/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
@@ -470,18 +470,6 @@ class SyntaxHighlight_GeSHi {
 	}
 
 	/**
-	 * Get the GeSHI's version information while Special:Version is read.
-	 * @param $extensionTypes
-	 * @return bool
-	 */
-	public static function extensionTypes( &$extensionTypes ) {
-		global $wgExtensionCredits;
-		self::initialise();
-		$wgExtensionCredits['parserhook']['SyntaxHighlight_GeSHi']['version'] = GESHI_VERSION;
-		return true;
-	}
-
-	/**
 	 * Register a ResourceLoader module providing styles for each supported language.
 	 *
 	 * @param ResourceLoader $resourceLoader
diff --git a/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php b/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
index da33ebee..6820ae1e 100644
--- a/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
+++ b/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
@@ -36,12 +36,15 @@ if( !defined( 'MEDIAWIKI' ) ) {
 	die();
 }
 
-$wgExtensionCredits['parserhook']['SyntaxHighlight_GeSHi'] = array(
+require_once __DIR__ . '/geshi/geshi.php';
+
+$wgExtensionCredits['parserhook'][] = array(
 	'path'           => __FILE__,
 	'name'           => 'SyntaxHighlight',
 	'author'         => array( 'Brion Vibber', 'Tim Starling', 'Rob Church', 'Niklas Laxström' ),
 	'descriptionmsg' => 'syntaxhighlight-desc',
 	'url'            => 'https://www.mediawiki.org/wiki/Extension:SyntaxHighlight_GeSHi',
+	'version'        => GESHI_VERSION,
 );
 
 // Change these in LocalSettings.php
@@ -56,7 +59,6 @@ $wgAutoloadClasses['SyntaxHighlight_GeSHi'] = $dir . 'SyntaxHighlight_GeSHi.clas
 $wgAutoloadClasses['ResourceLoaderGeSHiModule'] = $dir . 'ResourceLoaderGeSHiModule.php';
 $wgAutoloadClasses['ResourceLoaderGeSHiLocalModule'] = $dir . 'ResourceLoaderGeSHiLocalModule.php';
 
-$wgHooks['ExtensionTypes'][] = 'SyntaxHighlight_GeSHi::extensionTypes';
 $wgHooks['ResourceLoaderRegisterModules'][] = 'SyntaxHighlight_GeSHi::resourceLoaderRegisterModules';
 $wgHooks['ContentGetParserOutput'][] = 'SyntaxHighlight_GeSHi::renderHook';