[MediaWiki-commits] [Gerrit] mediawiki...HelpPages[master]: Convert HelpPages to use extension registration

2018-01-21 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405578 )

Change subject: Convert HelpPages to use extension registration
..


Convert HelpPages to use extension registration

Bug: T185407
Change-Id: I32eb35853001c8f24f4025fa20bb00c2d25200f7
---
M HelpPages.php
A extension.json
2 files changed, 52 insertions(+), 37 deletions(-)

Approvals:
  Mainframe98: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/HelpPages.php b/HelpPages.php
index 2c69e5b..302ca12 100644
--- a/HelpPages.php
+++ b/HelpPages.php
@@ -12,40 +12,16 @@
  * @license Public domain
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-   exit;
-}
-
-/**
- * How long to cache the rendered HTML for
- *
- * default is one week
- */
-$wgHelpPagesExpiry = 60 * 60 * 24 * 7;
-
-$wgExtensionCredits['other'][] = array(
-   'path' => __FILE__,
-   'name' => 'HelpPages',
-   'author' => 'Kunal Mehta',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:HelpPages',
-   'descriptionmsg' => 'helppages-desc',
-   'version' => '0.3.0',
-);
-
-$dir = dirname(__FILE__);
-
-$wgAutoloadClasses['HelpPages'] = $dir . '/HelpPages.body.php';
-$wgAutoloadClasses['HelpPagesHooks'] = $dir . '/HelpPages.hooks.php';
-
-$wgMessagesDirs['HelpPages'] = __DIR__ . '/i18n';
-
-$wgHooks['ShowMissingArticle'][] = 'HelpPagesHooks::onShowMissingArticle';
-$wgHooks['SkinTemplateNavigation::Universal'][] = 
'HelpPagesHooks::onSkinTemplateNavigationUniversal';
-$wgHooks['ArticlePurge'][] = 'HelpPagesHooks::onArticlePurge';
-$wgHooks['LinkBegin'][] = 'HelpPagesHooks::onLinkBegin';
-
-$wgResourceModules['ext.HelpPages'] = array(
-   'styles' => 'ext.HelpPages.css',
-   'localBasePath' => $dir,
-   'remoteExtPath' => 'HelpPages',
-);
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'HelpPages' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['HelpPages'] = __DIR__ . '/i18n';
+   wfWarn(
+   'Deprecated PHP entry point used for the HelpPages extension. ' 
.
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );
+   return;
+} else {
+   die( 'This version of the HelpPages extension requires MediaWiki 1.29+' 
);
+}
\ No newline at end of file
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..d0c6990
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,39 @@
+{
+   "name": "HelpPages",
+   "version": "0.4.0",
+   "author": "Kunal Mehta",
+   "url": "https://www.mediawiki.org/wiki/Extension:HelpPages";,
+   "descriptionmsg": "helppages-desc",
+   "license-name": "Unlicense",
+   "type": "other",
+   "MessagesDirs": {
+   "HelpPages": [
+   "i18n"
+   ]
+   },
+   "AutoloadClasses": {
+   "HelpPages": "HelpPages.body.php",
+   "HelpPagesHooks": "HelpPages.hooks.php"
+   },
+   "ResourceModules": {
+   "ext.HelpPages": {
+   "styles": "ext.HelpPages.css"
+   }
+   },
+   "ResourceFileModulePaths": {
+   "localBasePath": "",
+   "remoteExtPath": "HelpPages"
+   },
+   "Hooks": {
+   "ShowMissingArticle": "HelpPagesHooks::onShowMissingArticle",
+   "SkinTemplateNavigation::Universal": 
"HelpPagesHooks::onSkinTemplateNavigationUniversal",
+   "ArticlePurge": "HelpPagesHooks::onArticlePurge",
+   "LinkBegin": "HelpPagesHooks::onLinkBegin"
+   },
+   "config": {
+   "HelpPagesExpiry": {
+   "value": 604800
+   }
+   },
+   "manifest_version": 2
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I32eb35853001c8f24f4025fa20bb00c2d25200f7
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/HelpPages
Gerrit-Branch: master
Gerrit-Owner: Jayprakash12345 <0freerunn...@gmail.com>
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jayprakash12345 <0freerunn...@gmail.com>
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Johnduhart 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Mainframe98 
Gerrit-Reviewer: MarcoAurelio 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...HelpPages[master]: Convert HelpPages to use extension registration

2018-01-21 Thread Jayprakash12345 (Code Review) 
Jayprakash12345 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405578 )

Change subject: Convert HelpPages to use extension registration
..

Convert HelpPages to use extension registration

Bug: T185407
Change-Id: I32eb35853001c8f24f4025fa20bb00c2d25200f7
---
M HelpPages.php
A extension.json
2 files changed, 51 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/HelpPages 
refs/changes/78/405578/2

diff --git a/HelpPages.php b/HelpPages.php
index 2c69e5b..302ca12 100644
--- a/HelpPages.php
+++ b/HelpPages.php
@@ -12,40 +12,16 @@
  * @license Public domain
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-   exit;
-}
-
-/**
- * How long to cache the rendered HTML for
- *
- * default is one week
- */
-$wgHelpPagesExpiry = 60 * 60 * 24 * 7;
-
-$wgExtensionCredits['other'][] = array(
-   'path' => __FILE__,
-   'name' => 'HelpPages',
-   'author' => 'Kunal Mehta',
-   'url' => 'https://www.mediawiki.org/wiki/Extension:HelpPages',
-   'descriptionmsg' => 'helppages-desc',
-   'version' => '0.3.0',
-);
-
-$dir = dirname(__FILE__);
-
-$wgAutoloadClasses['HelpPages'] = $dir . '/HelpPages.body.php';
-$wgAutoloadClasses['HelpPagesHooks'] = $dir . '/HelpPages.hooks.php';
-
-$wgMessagesDirs['HelpPages'] = __DIR__ . '/i18n';
-
-$wgHooks['ShowMissingArticle'][] = 'HelpPagesHooks::onShowMissingArticle';
-$wgHooks['SkinTemplateNavigation::Universal'][] = 
'HelpPagesHooks::onSkinTemplateNavigationUniversal';
-$wgHooks['ArticlePurge'][] = 'HelpPagesHooks::onArticlePurge';
-$wgHooks['LinkBegin'][] = 'HelpPagesHooks::onLinkBegin';
-
-$wgResourceModules['ext.HelpPages'] = array(
-   'styles' => 'ext.HelpPages.css',
-   'localBasePath' => $dir,
-   'remoteExtPath' => 'HelpPages',
-);
+if ( function_exists( 'wfLoadExtension' ) ) {
+   wfLoadExtension( 'HelpPages' );
+   // Keep i18n globals so mergeMessageFileList.php doesn't break
+   $wgMessagesDirs['HelpPages'] = __DIR__ . '/i18n';
+   wfWarn(
+   'Deprecated PHP entry point used for the HelpPages extension. ' 
.
+   'Please use wfLoadExtension instead, ' .
+   'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+   );
+   return;
+} else {
+   die( 'This version of the HelpPages extension requires MediaWiki 1.29+' 
);
+}
\ No newline at end of file
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..78a0a3b
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,38 @@
+{
+   "name": "HelpPages",
+   "version": "0.3.0",
+   "author": "Kunal Mehta",
+   "url": "https://www.mediawiki.org/wiki/Extension:HelpPages";,
+   "descriptionmsg": "helppages-desc",
+   "type": "other",
+   "MessagesDirs": {
+   "HelpPages": [
+   "i18n"
+   ]
+   },
+   "AutoloadClasses": {
+   "HelpPages": "HelpPages.body.php",
+   "HelpPagesHooks": "HelpPages.hooks.php"
+   },
+   "ResourceModules": {
+   "ext.HelpPages": {
+   "styles": "ext.HelpPages.css"
+   }
+   },
+   "ResourceFileModulePaths": {
+   "localBasePath": "",
+   "remoteExtPath": "HelpPages"
+   },
+   "Hooks": {
+   "ShowMissingArticle": "HelpPagesHooks::onShowMissingArticle",
+   "SkinTemplateNavigation::Universal": 
"HelpPagesHooks::onSkinTemplateNavigationUniversal",
+   "ArticlePurge": "HelpPagesHooks::onArticlePurge",
+   "LinkBegin": "HelpPagesHooks::onLinkBegin"
+   },
+   "config": {
+   "HelpPagesExpiry": {
+   "value": 604800
+   }
+   },
+   "manifest_version": 2
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32eb35853001c8f24f4025fa20bb00c2d25200f7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/HelpPages
Gerrit-Branch: master
Gerrit-Owner: Jayprakash12345 <0freerunn...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits