jenkins-bot has submitted this change and it was merged. Change subject: Add extension.json, empty php entry point ......................................................................
Add extension.json, empty php entry point Bug: T87907 Change-Id: Ie3310b409afcda985b6acd39d37bb51aac18d9be --- M DismissableSiteNotice.php A extension.json 2 files changed, 61 insertions(+), 39 deletions(-) Approvals: Paladox: Looks good to me, but someone else must approve Legoktm: Looks good to me, but someone else must approve Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/DismissableSiteNotice.php b/DismissableSiteNotice.php index afad56c..bd66784 100644 --- a/DismissableSiteNotice.php +++ b/DismissableSiteNotice.php @@ -1,4 +1,5 @@ <?php + /** * DismissableSiteNotice extension - allows users to dismiss (hide) * the sitenotice. @@ -13,43 +14,15 @@ * @link http://www.mediawiki.org/wiki/Extension:DismissableSiteNotice Documentation */ - # Not a valid entry point, skip unless MEDIAWIKI is defined -if ( !defined( 'MEDIAWIKI' ) ) { - echo "This is a MediaWiki extension"; - exit( 1 ); +if ( function_exists( 'wfLoadExtension' ) ) { + wfLoadExtension( 'DismissableSiteNotice' ); + // Keep i18n globals so mergeMessageFileList.php doesn't break + $wgMessagesDirs['DismissableSiteNotice'] = __DIR__ . '/i18n'; + /* wfWarn( + 'Deprecated PHP entry point used for DismissableSiteNotice extension. Please use wfLoadExtension instead, ' . + 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' + ); */ + return; +} else { + die( 'This version of the DismissableSiteNotice extension requires MediaWiki 1.25+' ); } - -$wgExtensionCredits['other'][] = array( - 'path' => __FILE__, - 'name' => 'DismissableSiteNotice', - 'author' => array( - 'Brion Vibber', - 'Kevin Israel', - 'Dror S.', - ), - 'version' => '1.0.1', - 'descriptionmsg' => 'sitenotice-desc', - 'url' => 'https://www.mediawiki.org/wiki/Extension:DismissableSiteNotice', -); - -$wgMessagesDirs['DismissableSiteNotice'] = __DIR__ . '/i18n'; -$wgAutoloadClasses['DismissableSiteNoticeHooks'] = __DIR__ . '/DismissableSiteNotice.hooks.php'; - -$wgResourceModules['ext.dismissableSiteNotice'] = array( - 'localBasePath' => __DIR__ . '/modules', - 'remoteExtPath' => 'DismissableSiteNotice/modules', - 'scripts' => 'ext.dismissableSiteNotice.js', - 'styles' => 'ext.dismissableSiteNotice.css', - 'dependencies' => array( - 'jquery.cookie', - 'mediawiki.util', - ), - 'targets' => array( 'desktop', 'mobile' ), - 'position' => 'top', -); - -$wgHooks['SiteNoticeAfter'][] = 'DismissableSiteNoticeHooks::onSiteNoticeAfter'; - -// Default settings -$wgMajorSiteNoticeID = 1; -$wgDismissableSiteNoticeForAnons = false; diff --git a/extension.json b/extension.json new file mode 100644 index 0000000..35ba973 --- /dev/null +++ b/extension.json @@ -0,0 +1,49 @@ +{ + "name": "DismissableSiteNotice", + "version": "1.0.1", + "author": [ + "Brion Vibber", + "Kevin Israel", + "Dror S." + ], + "url": "https://www.mediawiki.org/wiki/Extension:DismissableSiteNotice";, + "descriptionmsg": "sitenotice-desc", + "type": "other", + "config": { + "MajorSiteNoticeID": 1, + "DismissableSiteNoticeForAnons": false + }, + "Hooks": { + "SiteNoticeAfter": [ + "DismissableSiteNoticeHooks::onSiteNoticeAfter" + ] + }, + "MessagesDirs": { + "DismissableSiteNotice": [ + "i18n" + ] + }, + "ResourceModules": { + "ext.dismissableSiteNotice": { + "scripts": "ext.dismissableSiteNotice.js", + "styles": "ext.dismissableSiteNotice.css", + "dependencies": [ + "jquery.cookie", + "mediawiki.util" + ], + "targets": [ + "desktop", + "mobile" + ], + "position": "top" + } + }, + "ResourceFileModulePaths": { + "localBasePath": "modules", + "remoteExtPath": "DismissableSiteNotice/modules" + }, + "AutoloadClasses": { + "DismissableSiteNoticeHooks": "DismissableSiteNotice.hooks.php" + }, + "manifest_version": 1 +} -- To view, visit https://gerrit.wikimedia.org/r/194041 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie3310b409afcda985b6acd39d37bb51aac18d9be Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/extensions/DismissableSiteNotice Gerrit-Branch: master Gerrit-Owner: Legoktm <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: Paladox <[email protected]> Gerrit-Reviewer: Reedy <[email protected]> Gerrit-Reviewer: Yurik <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
