Ricordisamoa has uploaded a new change for review.

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

Change subject: Add extension.json, empty PHP entry point
......................................................................

Add extension.json, empty PHP entry point

Change-Id: I9606f6805082a409128a735b3d068bd828b008c6
---
M Newsletter.php
A extension.json
2 files changed, 93 insertions(+), 78 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter 
refs/changes/79/233979/1

diff --git a/Newsletter.php b/Newsletter.php
index eb45d47..5bb248a 100755
--- a/Newsletter.php
+++ b/Newsletter.php
@@ -1,81 +1,15 @@
 <?php
-/*
- * @file
- * @author Siebrand Mazeland
- * @copyright Copyright © 2013 Siebrand Mazeland
- * @license GPL-2.0+
- */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-       echo <<<EOT
-To install the Newsletter extension, put the following line in 
LocalSettings.php:
-require_once( "\$IP/extensions/Newsletter/Newsletter.php" );
-EOT;
-       exit( 1 );
+if ( function_exists( 'wfLoadExtension' ) ) {
+       wfLoadExtension( 'Newsletter' );
+       // Keep i18n globals so mergeMessageFileList.php doesn't break
+       $wgMessagesDirs['Newsletter'] = __DIR__ . '/i18n';
+       $wgExtensionMessagesFiles['NewsletterAlias'] = __DIR__ . 
'/Newsletter.alias.php';
+       /* wfWarn(
+               'Deprecated PHP entry point used for Newsletter extension. 
Please use wfLoadExtension instead, ' .
+               'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+       ); */
+       return true;
+} else {
+       die( 'This version of the Newsletter extension requires MediaWiki 
1.25+' );
 }
-
-$wgExtensionCredits[ 'other' ][ ] = array(
-       'path'           => __FILE__,
-       'name'           => 'Newsletter',
-       'author'         => array( 'Siebrand Mazeland', 'Tina Johnson' ),
-       'url'            => 
'https://www.mediawiki.org/wiki/Extension:Newsletter',
-       'descriptionmsg' => 'newsletter-desc',
-       'version'        => '1.2.0',
-       'license-name'   => 'GPL-2.0+',
-);
-
-$wgMessagesDirs['Newsletter'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['NewsletterAlias'] = __DIR__ . 
'/Newsletter.alias.php';
-
-$wgAutoloadClasses['NewsletterHooks'] = __DIR__ . '/Newsletter.hooks.php';
-$wgAutoloadClasses['SpecialNewsletterCreate'] = __DIR__ . 
'/includes/SpecialNewsletterCreate.php';
-$wgAutoloadClasses['SpecialNewsletterManage'] = __DIR__ . 
'/includes/SpecialNewsletterManage.php';
-$wgAutoloadClasses['SpecialNewsletters'] = __DIR__ . 
'/includes/SpecialNewsletters.php';
-$wgAutoloadClasses['EchoNewsletterFormatter'] = __DIR__ . 
'/includes/EchoNewsletterFormatter.php';
-$wgAutoloadClasses['NewsletterTablePager'] = __DIR__ . 
'/includes/SpecialNewsletters.php';
-$wgAutoloadClasses['ApiNewsletter'] = __DIR__ . '/includes/ApiNewsletter.php';
-$wgAutoloadClasses['ApiNewsletterManage'] = __DIR__ . 
'/includes/ApiNewsletterManage.php';
-$wgAutoloadClasses['NewsletterManageTable'] = __DIR__ . 
'/includes/SpecialNewsletterManage.php';
-
-$wgSpecialPages['NewsletterCreate'] = 'SpecialNewsletterCreate';
-$wgSpecialPages['NewsletterManage'] = 'SpecialNewsletterManage';
-$wgSpecialPages['Newsletters'] = 'SpecialNewsletters';
-
-$wgAPIModules['newsletterapi'] = 'ApiNewsletter';
-$wgAPIModules['newslettermanageapi'] = 'ApiNewsletterManage';
-
-$wgResourceModules['ext.newsletter'] = array(
-       'scripts' => 'modules/ext.newsletter.js',
-       'dependencies' => array(
-               'jquery.cookie',
-               'jquery.tabIndex',
-               'mediawiki.jqueryMsg',
-               'mediawiki.api',
-               'jquery.confirmable'
-       ),
-
-       'localBasePath' => __DIR__,
-       'remoteExtPath' => 'Newsletter',
-
-);
-
-$wgResourceModules['ext.newslettermanage'] = array(
-       'scripts' => 'modules/ext.newslettermanage.js',
-       'dependencies' => array(
-               'jquery.cookie',
-               'jquery.tabIndex',
-               'mediawiki.jqueryMsg',
-               'mediawiki.api',
-               'jquery.confirmable'
-       ),
-
-       'localBasePath' => __DIR__,
-       'remoteExtPath' => 'Newsletter',
-
-);
-
-//Register Hooks
-$wgHooks['LoadExtensionSchemaUpdates'][] = 
'NewsletterHooks::onLoadExtensionSchemaUpdates';
-$wgHooks['BeforeCreateEchoEvent'][] = 
'NewsletterHooks::onBeforeCreateEchoEvent';
-$wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'NewsletterHooks::onEchoGetDefaultNotifiedUsers';
-$wgHooks['UnitTestsList'][] = 'NewsletterHooks::onUnitTestsList';
diff --git a/extension.json b/extension.json
new file mode 100644
index 0000000..1265437
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,81 @@
+{
+       "name": "Newsletter",
+       "version": "1.2.0",
+       "author": [
+               "Siebrand Mazeland",
+               "Tina Johnson"
+       ],
+       "url": "https://www.mediawiki.org/wiki/Extension:Newsletter";,
+       "descriptionmsg": "newsletter-desc",
+       "license-name": "GPL-2.0+",
+       "type": "other",
+       "SpecialPages": {
+               "NewsletterCreate": "SpecialNewsletterCreate",
+               "NewsletterManage": "SpecialNewsletterManage",
+               "Newsletters": "SpecialNewsletters"
+       },
+       "APIModules": {
+               "newsletterapi": "ApiNewsletter",
+               "newslettermanageapi": "ApiNewsletterManage"
+       },
+       "MessagesDirs": {
+               "Newsletter": [
+                       "i18n"
+               ]
+       },
+       "ExtensionMessagesFiles": {
+               "NewsletterAlias": "Newsletter.alias.php"
+       },
+       "AutoloadClasses": {
+               "NewsletterHooks": "Newsletter.hooks.php",
+               "SpecialNewsletterCreate": 
"includes/SpecialNewsletterCreate.php",
+               "SpecialNewsletterManage": 
"includes/SpecialNewsletterManage.php",
+               "SpecialNewsletters": "includes/SpecialNewsletters.php",
+               "EchoNewsletterFormatter": 
"includes/EchoNewsletterFormatter.php",
+               "NewsletterTablePager": "includes/SpecialNewsletters.php",
+               "ApiNewsletter": "includes/ApiNewsletter.php",
+               "ApiNewsletterManage": "includes/ApiNewsletterManage.php",
+               "NewsletterManageTable": "includes/SpecialNewsletterManage.php"
+       },
+       "ResourceModules": {
+               "ext.newsletter": {
+                       "scripts": "modules/ext.newsletter.js",
+                       "dependencies": [
+                               "jquery.cookie",
+                               "jquery.tabIndex",
+                               "mediawiki.jqueryMsg",
+                               "mediawiki.api",
+                               "jquery.confirmable"
+                       ]
+               },
+               "ext.newslettermanage": {
+                       "scripts": "modules/ext.newslettermanage.js",
+                       "dependencies": [
+                               "jquery.cookie",
+                               "jquery.tabIndex",
+                               "mediawiki.jqueryMsg",
+                               "mediawiki.api",
+                               "jquery.confirmable"
+                       ]
+               }
+       },
+       "ResourceFileModulePaths": {
+               "localBasePath": "",
+               "remoteExtPath": "Newsletter"
+       },
+       "Hooks": {
+               "LoadExtensionSchemaUpdates": [
+                       "NewsletterHooks::onLoadExtensionSchemaUpdates"
+               ],
+               "BeforeCreateEchoEvent": [
+                       "NewsletterHooks::onBeforeCreateEchoEvent"
+               ],
+               "EchoGetDefaultNotifiedUsers": [
+                       "NewsletterHooks::onEchoGetDefaultNotifiedUsers"
+               ],
+               "UnitTestsList": [
+                       "NewsletterHooks::onUnitTestsList"
+               ]
+       },
+       "manifest_version": 1
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9606f6805082a409128a735b3d068bd828b008c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa <[email protected]>

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

Reply via email to