MtDu has uploaded a new change for review. https://gerrit.wikimedia.org/r/263032
Change subject: Convert RelatedSites to use new extension registration ...................................................................... Convert RelatedSites to use new extension registration Bug: T87966 Change-Id: I173ea9ce23a2794a1c8f2a048b8ca31e28a0bc2d --- D RelatedSites.i18n.php M RelatedSites.php A extension.json 3 files changed, 46 insertions(+), 70 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedSites refs/changes/32/263032/1 diff --git a/RelatedSites.i18n.php b/RelatedSites.i18n.php deleted file mode 100644 index 2171e4f..0000000 --- a/RelatedSites.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -<?php -/** - * This is a backwards-compatibility shim, generated by: - * https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim7e3db85f8026b315' ) ) { - function wfJsonI18nShim7e3db85f8026b315( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim7e3db85f8026b315'; -} diff --git a/RelatedSites.php b/RelatedSites.php index cb6fd73..6f0f43d 100644 --- a/RelatedSites.php +++ b/RelatedSites.php @@ -1,37 +1,13 @@ <?php - -if ( !defined( 'MEDIAWIKI' ) ) { - die( 'This file is a MediaWiki extension, it is not a valid entry point' ); +if ( function_exists( 'wfLoadExtension' ) ) { + wfLoadExtension( 'RelatedSites' ); + // Keep i18n globals so mergeMessageFileList.php doesn't break + $wgMessagesDirs['RelatedSites'] = __DIR__ . '/i18n'; + /*wfWarn( + 'Deprecated PHP entry point used for RelatedSites extension. Please use wfLoadExtension instead, ' . + 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' + );*/ + return; +} else { + die( 'This version of the RelatedSites extension requires MediaWiki 1.25+' ); } - -// autoloader -$wgAutoloadClasses['RelatedSites'] = __DIR__ . '/RelatedSites.class.php'; - -// extension & magic words i18n -$wgMessagesDirs['RelatedSites'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['RelatedSites'] = __DIR__ . '/RelatedSites.i18n.php'; - -// hooks -$wgRelatedSites = new RelatedSites; -$wgHooks['SkinTemplateOutputPageBeforeExec'][] = array( &$wgRelatedSites, 'onSkinTemplateOutputPageBeforeExec' ); -$wgHooks['ParserBeforeTidy'][] = array( &$wgRelatedSites, 'onParserBeforeTidy' ); - -// @TODO Add a global to control these, and then probably use wgExtensionFunctions hook -// 2 same hooks, with different position though - enable what you want -// the first one is a "clean" solution, but has its content inserted _before_ the toolbox -//$wgHooks['SkinBuildSidebar'][] = array( &$wgRelatedSites, 'onSkinBuildSidebar' ); -// the second one is nasty: echo'ing raw html _after_ the regular toolbox -$wgHooks['SkinTemplateToolboxEnd'][] = array( &$wgRelatedSites, 'onSkinTemplateToolboxEnd' ); - -// credits -$wgExtensionCredits['parserhook']['RelatedSites'] = array( - 'path' => __FILE__, - 'name' => 'RelatedSites', - 'url' => '//www.mediawiki.org/wiki/Extension:RelatedSites', - 'descriptionmsg' => 'relatedsites-desc', - 'author' => array( 'Roland Unger', 'Hans Musil', 'Matthias Mullie' ), - 'version' => '1.1' -); - -// related interwiki prefixes that should show up on relatedsites sidebar -$wgRelatedSitesPrefixes = array(); diff --git a/extension.json b/extension.json new file mode 100644 index 0000000..e1bc4a9 --- /dev/null +++ b/extension.json @@ -0,0 +1,35 @@ +{ + "name": "RelatedSites", + "url": "https://www.mediawiki.org/wiki/Extension:RelatedSites";, + "descriptionmsg": "relatedsites-desc", + "author": [ + "Roland Unger", + "Hans Musil", + "Matthias Mullie" + ], + "version": "1.1", + "type": "RelatedSites", + "AutoloadClasses": { + "RelatedSites": "RelatedSites.class.php" + }, + "MessageDirs": { + "RelatedSites": [ + "i18n" + ] + }, + "Hooks": { + "SkinTemplateOutputPageBeforeExec": [ + "RelatedSites::onSkinTemplateOutputPageBeforeExec" + ], + "ParserBeforeTidy": [ + "RelatedSites::onParserBeforeTidy" + ], + "SkinTemplateToolboxEnd": [ + "RelatedSites::onSkinTemplateToolboxEnd" + ] + }, + "config": { + "RelatedSitesPrefixes": [] + }, + "manifest_version": 1 +} -- To view, visit https://gerrit.wikimedia.org/r/263032 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I173ea9ce23a2794a1c8f2a048b8ca31e28a0bc2d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RelatedSites Gerrit-Branch: master Gerrit-Owner: MtDu <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
