Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/185648

Change subject: Remove ['SyntaxHighlight_GeSHi'] from $wgExtensionCredits
......................................................................

Remove ['SyntaxHighlight_GeSHi'] from $wgExtensionCredits

* This patch removes ['SyntaxHighlight_GeSHi'] from $wgExtensionCredits.

Change-Id: I518e9c0bd91fdbb0df9ae966d4ba96e0e433e399
---
M SyntaxHighlight_GeSHi.class.php
M SyntaxHighlight_GeSHi.php
2 files changed, 4 insertions(+), 14 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SyntaxHighlight_GeSHi 
refs/changes/48/185648/1

diff --git a/SyntaxHighlight_GeSHi.class.php b/SyntaxHighlight_GeSHi.class.php
index 6d1f73c..3580d01 100644
--- a/SyntaxHighlight_GeSHi.class.php
+++ b/SyntaxHighlight_GeSHi.class.php
@@ -470,18 +470,6 @@
        }
 
        /**
-        * 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/SyntaxHighlight_GeSHi.php b/SyntaxHighlight_GeSHi.php
index da33ebe..6820ae1 100644
--- a/SyntaxHighlight_GeSHi.php
+++ b/SyntaxHighlight_GeSHi.php
@@ -36,12 +36,15 @@
        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['ResourceLoaderGeSHiModule'] = $dir . 
'ResourceLoaderGeSHiModule.php';
 $wgAutoloadClasses['ResourceLoaderGeSHiLocalModule'] = $dir . 
'ResourceLoaderGeSHiLocalModule.php';
 
-$wgHooks['ExtensionTypes'][] = 'SyntaxHighlight_GeSHi::extensionTypes';
 $wgHooks['ResourceLoaderRegisterModules'][] = 
'SyntaxHighlight_GeSHi::resourceLoaderRegisterModules';
 $wgHooks['ContentGetParserOutput'][] = 'SyntaxHighlight_GeSHi::renderHook';
 

-- 
To view, visit https://gerrit.wikimedia.org/r/185648
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I518e9c0bd91fdbb0df9ae966d4ba96e0e433e399
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SyntaxHighlight_GeSHi
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to