jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405577 )
Change subject: Convert WikEdDiff to use extension registration ...................................................................... Convert WikEdDiff to use extension registration Bug: T185408 Change-Id: I0c236772661d9d37dc051db6507b30fcaa73efee --- M WikEdDiff.php A extension.json 2 files changed, 47 insertions(+), 28 deletions(-) Approvals: Mainframe98: Looks good to me, but someone else must approve jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/WikEdDiff.php b/WikEdDiff.php index f7cd3d1..df95e83 100644 --- a/WikEdDiff.php +++ b/WikEdDiff.php @@ -23,31 +23,16 @@ * @author Cacycle (https://en.wikipedia.org/wiki/User:Cacycle) */ - -global $wgExtensionCredits, $wgResourceModules, $wgHooks; - -// extension credits -$wgExtensionCredits['other'][] = array( - 'path' => __FILE__, - 'name' => 'wikEdDiff', - 'author' => 'Cacycle', - 'url' => 'https://www.mediawiki.org/wiki/Extension:wikEdDiff', - 'descriptionmsg' => 'wiked-diff-desc', - 'version' => '1.2.5', - 'license-name' => 'GPL-2.0+' // GNU General Public License v2.0 or later -); - -// hook up -$dir = __DIR__ . '/'; -$wgResourceModules['ext.wikEdDiff'] = array( - 'localBasePath' => $dir . 'modules', - 'remoteExtPath' => 'WikEdDiff/modules', - 'scripts' => 'ext.wikEdDiff.js', - 'styles' => 'ext.wikEdDiff.css', - 'position' => 'top' -); -$wgMessagesDirs['WikEdDifferenceEngine'] = $dir . 'i18n'; -$wgAutoloadClasses['WikEdDifferenceEngine'] = $dir . 'WikEdDiff.body.php'; -$wgAutoloadClasses['WikEdDiff'] = $dir . 'WikEdDiff.body.php'; -$wgAutoloadClasses['WikEdDiffText'] = $dir . 'WikEdDiff.body.php'; -$wgHooks['GetDifferenceEngine'][] = 'WikEdDifferenceEngine::onGetDifferenceEngine'; + if ( function_exists( 'wfLoadExtension' ) ) { + wfLoadExtension( 'WikEdDiff' ); + // Keep i18n globals so mergeMessageFileList.php doesn't break + $wgMessagesDirs['WikEdDiff'] = __DIR__ . '/i18n'; + wfWarn( + 'Deprecated PHP entry point used for the WikEdDiff extension. ' . + 'Please use wfLoadExtension instead, ' . + 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' + ); + return; +} else { + die( 'This version of the WikEdDiff extension requires MediaWiki 1.29+' ); +} \ No newline at end of file diff --git a/extension.json b/extension.json new file mode 100644 index 0000000..dcf2b49 --- /dev/null +++ b/extension.json @@ -0,0 +1,34 @@ +{ + "name": "wikEdDiff", + "version": "1.2.5", + "author": "Cacycle", + "url": "https://www.mediawiki.org/wiki/Extension:wikEdDiff", + "descriptionmsg": "wiked-diff-desc", + "license-name": "GPL-2.0+", + "type": "other", + "MessagesDirs": { + "WikEdDifferenceEngine": [ + "i18n" + ] + }, + "AutoloadClasses": { + "WikEdDifferenceEngine": "WikEdDiff.body.php", + "WikEdDiff": "WikEdDiff.body.php", + "WikEdDiffText": "WikEdDiff.body.php" + }, + "ResourceModules": { + "ext.wikEdDiff": { + "scripts": "ext.wikEdDiff.js", + "styles": "ext.wikEdDiff.css", + "position": "top" + } + }, + "ResourceFileModulePaths": { + "localBasePath": "modules", + "remoteExtPath": "WikEdDiff/modules" + }, + "Hooks": { + "GetDifferenceEngine": "WikEdDifferenceEngine::onGetDifferenceEngine" + }, + "manifest_version": 2 +} -- To view, visit https://gerrit.wikimedia.org/r/405577 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0c236772661d9d37dc051db6507b30fcaa73efee Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/WikEdDiff Gerrit-Branch: master Gerrit-Owner: Jayprakash12345 <0freerunn...@gmail.com> Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Johnduhart <j...@compwhizii.net> Gerrit-Reviewer: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: Mainframe98 <k.s.w...@hotmail.com> Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits