Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/207832
Change subject: Re-build extension.json, deprecate and empty CiteThisPage.php ...................................................................... Re-build extension.json, deprecate and empty CiteThisPage.php Change-Id: I931c0d4f4a7f14418c4763eaf62fa22513e39955 (cherry picked from commit eda4c0fdae4952c63686a2b026eb4d41661dda68) --- M CiteThisPage.php M extension.json 2 files changed, 24 insertions(+), 54 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CiteThisPage refs/changes/32/207832/1 diff --git a/CiteThisPage.php b/CiteThisPage.php index e6c577d..34b85e0 100644 --- a/CiteThisPage.php +++ b/CiteThisPage.php @@ -1,47 +1,15 @@ <?php -if ( !defined( 'MEDIAWIKI' ) ) die(); -/** - * A special page extension that adds a special page that generates citations - * about pages. - * - * @file - * @ingroup Extensions - * - * @link http://www.mediawiki.org/wiki/Extension:CiteThisPage Documentation - * - * @author Ævar Arnfjörð Bjarmason <[email protected]> - * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason - * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later - */ -$wgExtensionCredits['specialpage'][] = array( - 'path' => __FILE__, - 'name' => 'CiteThisPage', - 'author' => array( 'Ævar Arnfjörð Bjarmason', 'James D. Forrester' ), - 'descriptionmsg' => 'citethispage-desc', - 'url' => 'https://www.mediawiki.org/wiki/Extension:CiteThisPage', - 'license-name' => 'GPL-2.0+' -); - -# Internationalisation files -$wgMessagesDirs['CiteThisPage'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['CiteThisPageAliases'] = __DIR__ . '/CiteThisPage.alias.php'; - -$wgHooks['SkinTemplateBuildNavUrlsNav_urlsAfterPermalink'][] = 'CiteThisPageHooks::onSkinTemplateBuildNavUrlsNav_urlsAfterPermalink'; -$wgHooks['SkinTemplateToolboxEnd'][] = 'CiteThisPageHooks::onSkinTemplateToolboxEnd'; - -$wgSpecialPages['CiteThisPage'] = 'SpecialCiteThisPage'; -$wgSpecialPageGroups['CiteThisPage'] = 'pagetools'; -$wgAutoloadClasses['SpecialCiteThisPage'] = __DIR__ . '/SpecialCiteThisPage.php'; -$wgAutoloadClasses['CiteThisPageOutput'] = __DIR__ . '/SpecialCiteThisPage.php'; -$wgAutoloadClasses['CiteThisPageHooks'] = __DIR__ . '/CiteThisPage.hooks.php'; - -// Resources -$citeThisPageResourceTemplate = array( - 'localBasePath' => __DIR__ . '/modules', - 'remoteExtPath' => 'CiteThisPage/modules' -); - -$wgResourceModules['ext.citeThisPage'] = $citeThisPageResourceTemplate + array( - 'styles' => 'ext.citeThisPage.css', -); +if ( function_exists( 'wfLoadExtension' ) ) { + wfLoadExtension( 'CiteThisPage' ); + // Keep i18n globals so mergeMessageFileList.php doesn't break + $wgMessagesDirs['CiteThisPage'] = __DIR__ . '/i18n'; + $wgExtensionMessagesFiles['CiteThisPageAliases'] = __DIR__ . '/CiteThisPage.alias.php'; + /* wfWarn( + 'Deprecated PHP entry point used for CiteThisPage extension. Please use wfLoadExtension instead, ' . + 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' + ); */ + return; +} else { + die( 'This version of the CiteThisPage extension requires MediaWiki 1.25+' ); +} diff --git a/extension.json b/extension.json index 8a5e59c..3095321 100644 --- a/extension.json +++ b/extension.json @@ -11,6 +11,11 @@ "ExtensionMessagesFiles": { "CiteThisPageAliases": "CiteThisPage.alias.php" }, + "MessagesDirs": { + "CiteThisPage": [ + "i18n" + ] + }, "Hooks": { "SkinTemplateBuildNavUrlsNav_urlsAfterPermalink": [ "CiteThisPageHooks::onSkinTemplateBuildNavUrlsNav_urlsAfterPermalink" @@ -19,17 +24,14 @@ "CiteThisPageHooks::onSkinTemplateToolboxEnd" ] }, - "MessagesDirs": { - "CiteThisPage": [ - "i18n" - ] - }, "ResourceModules": { "ext.citeThisPage": { - "localBasePath": "modules", - "remoteExtPath": "CiteThisPage/modules", "styles": "ext.citeThisPage.css" } + }, + "ResourceFileModulePaths": { + "localBasePath": "modules", + "remoteExtPath": "CiteThisPage/modules" }, "SpecialPageGroups": { "CiteThisPage": "pagetools" @@ -39,7 +41,7 @@ }, "AutoloadClasses": { "SpecialCiteThisPage": "SpecialCiteThisPage.php", - "CiteThisPageHooks": "CiteThisPage.hooks.php", - "CiteThisPageOutput": "SpecialCiteThisPage.php" + "CiteThisPageOutput": "SpecialCiteThisPage.php", + "CiteThisPageHooks": "CiteThisPage.hooks.php" } } -- To view, visit https://gerrit.wikimedia.org/r/207832 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I931c0d4f4a7f14418c4763eaf62fa22513e39955 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CiteThisPage Gerrit-Branch: REL1_25 Gerrit-Owner: Legoktm <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
