[MediaWiki-commits] [Gerrit] Load some more extensions directly through wfLoadExtension()... - change (operations/mediawiki-config)

2015-10-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Load some more extensions directly through wfLoadExtension() 
(B-D)
..


Load some more extensions directly through wfLoadExtension() (B-D)

* ContributionTracking was skipped since it sounds fundraising-y
* DoubleWiki has an extension.json, but isn't loading through it yet.

Change-Id: Iac672617ecb7972c697b02739e6fc7fd9ff849a5
---
M wmf-config/CommonSettings.php
M wmf-config/extension-list
2 files changed, 18 insertions(+), 17 deletions(-)

Approvals:
  Chad: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index c7037ec..f30edf5 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -529,7 +529,7 @@
 $wgExpensiveParserFunctionLimit = 500;
 
 if ( $wmgUseCite ) {
-   require( $IP . '/extensions/Cite/Cite.php' );
+   wfLoadExtension( 'Cite' );
 }
 
 if ( $wmgUseCiteThisPage ) {
@@ -1278,7 +1278,7 @@
 
 // taking it live 2006-12-15 brion
 if ( $wmgUseDismissableSiteNotice ) {
-   require( 
"$IP/extensions/DismissableSiteNotice/DismissableSiteNotice.php" );
+   wfLoadExtension( 'DismissableSiteNotice' );
$wgDismissableSiteNoticeForAnons = true; // T59732
 }
 $wgMajorSiteNoticeID = '2';
@@ -1851,7 +1851,7 @@
 }
 
 if ( $wmgUseCommonsMetadata ) {
-   require_once( "$IP/extensions/CommonsMetadata/CommonsMetadata.php" );
+   wfLoadExtension( 'CommonsMetadata' );
$wgCommonsMetadataSetTrackingCategories = 
$wmgCommonsMetadataSetTrackingCategories;
$wgCommonsMetadataForceRecalculate = 
$wmgCommonsMetadataForceRecalculate;
 }
@@ -2020,7 +2020,7 @@
}
 
// Citoid
-   require_once "$IP/extensions/Citoid/Citoid.php";
+   wfLoadExtension( 'Citoid' );
$wgCitoidServiceUrl = '//citoid.wikimedia.org/api';
 }
 
@@ -2146,7 +2146,7 @@
 }
 
 if ( $wmgUseBounceHandler ) {
-   require_once "$IP/extensions/BounceHandler/BounceHandler.php";
+   wfLoadExtension( 'BounceHandler' );
// $wmgVERPsecret is set in PrivateSettings.php
$wgVERPsecret = $wmgVERPsecret;
$wgVERPdomainPart = 'wikimedia.org';
@@ -2494,11 +2494,12 @@
 }
 
 if ( $wmgUseDisambiguator ) {
+   wfLoadExtension( 'Disambiguator' );
require_once( "$IP/extensions/Disambiguator/Disambiguator.php" );
 }
 
 if ( $wmgUseCodeEditorForCore || $wmgUseScribunto || $wmgZeroPortal ) {
-   include_once( "$IP/extensions/CodeEditor/CodeEditor.php" );
+   wfLoadExtension( 'CodeEditor' );
$wgCodeEditorEnableCore = $wmgUseCodeEditorForCore;
if ( $wgDBname === 'metawiki' ) {
$wgHooks['CodeEditorGetPageLanguage'][] = function ( Title 
$title, &$lang ) {
@@ -2562,7 +2563,7 @@
 }
 
 if ( $wmgUseCreditsSource ) {
-   require_once( "$IP/extensions/CreditsSource/CreditsSource.php" );
+   wfLoadExtension( 'CreditsSource' );
 }
 
 if ( $wmgUseListings ) {
@@ -2674,7 +2675,7 @@
 }
 
 if ( $wmgUseContentTranslation ) {
-   require_once "$IP/extensions/ContentTranslation/ContentTranslation.php";
+   wfLoadExtension( 'ContentTranslation' );
// T76200: Public URL for cxserver instance
$wgContentTranslationSiteTemplates['cx'] = 
'//cxserver.wikimedia.org/v1';
// Used for html2wikitext when publishing
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 9d579cf..b8f84b3 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -4,7 +4,7 @@
 $IP/extensions/ApiSandbox/extension.json
 $IP/extensions/Babel/Babel.php
 $IP/extensions/BetaFeatures/extension.json
-$IP/extensions/BounceHandler/BounceHandler.php
+$IP/extensions/BounceHandler/extension.json
 $IP/extensions/Calendar/extension.json
 $IP/extensions/Campaigns/Campaigns.php
 $IP/extensions/CategoryTree/CategoryTree.php
@@ -13,25 +13,25 @@
 $IP/extensions/CharInsert/extension.json
 $IP/extensions/CheckUser/CheckUser.php
 $IP/extensions/CirrusSearch/CirrusSearch.php
-$IP/extensions/Cite/Cite.php
+$IP/extensions/Cite/extension.json
 $IP/extensions/CiteThisPage/extension.json
-$IP/extensions/Citoid/Citoid.php
+$IP/extensions/Citoid/extension.json
 $IP/extensions/cldr/cldr.php
 $IP/extensions/CleanChanges/CleanChanges.php
-$IP/extensions/CodeEditor/CodeEditor.php
+$IP/extensions/CodeEditor/extension.json
 $IP/extensions/CodeReview/extension.json
 $IP/extensions/Collection/Collection.php
-$IP/extensions/CommonsMetadata/CommonsMetadata.php
+$IP/extensions/CommonsMetadata/extension.json
 $IP/extensions/ConfirmEdit/ConfirmEdit.php
 $IP/extensions/ConfirmEdit/FancyCaptcha.php
 $IP/extensions/ContactPage/ContactPage.php
-$IP/extensions/ContentTranslation/ContentTranslation.php
+$IP/extensions/ContentTranslation/extension.json
 $IP/extensions/ContributionTracking/ContributionTracking.php
-$IP/extensions/CreditsSource/CreditsSource.php
+$IP/extensions/CreditsSource/extension.json
 $IP/ex

[MediaWiki-commits] [Gerrit] Load some more extensions directly through wfLoadExtension()... - change (operations/mediawiki-config)

2015-08-21 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

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

Change subject: Load some more extensions directly through wfLoadExtension() 
(B-D)
..

Load some more extensions directly through wfLoadExtension() (B-D)

* ContributionTracking was skipped since it sounds fundraising-y
* DoubleWiki has an extension.json, but isn't loading through it yet.

Change-Id: Iac672617ecb7972c697b02739e6fc7fd9ff849a5
---
M wmf-config/CommonSettings.php
M wmf-config/extension-list
2 files changed, 18 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/66/232966/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index abdb8c5..0b1f127 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -545,7 +545,7 @@
 $wgExpensiveParserFunctionLimit = 500;
 
 if ( $wmgUseCite ) {
-   require( $IP . '/extensions/Cite/Cite.php' );
+   wfLoadExtension( 'Cite' );
 }
 
 if ( $wmgUseCiteThisPage ) {
@@ -1299,7 +1299,7 @@
 
 // taking it live 2006-12-15 brion
 if ( $wmgUseDismissableSiteNotice ) {
-   require( 
"$IP/extensions/DismissableSiteNotice/DismissableSiteNotice.php" );
+   wfLoadExtension( 'DismissableSiteNotice' );
$wgDismissableSiteNoticeForAnons = true; // T59732
 }
 $wgMajorSiteNoticeID = '2';
@@ -1871,7 +1871,7 @@
 }
 
 if ( $wmgUseCommonsMetadata ) {
-   require_once( "$IP/extensions/CommonsMetadata/CommonsMetadata.php" );
+   wfLoadExtension( 'CommonsMetadata' );
$wgCommonsMetadataSetTrackingCategories = 
$wmgCommonsMetadataSetTrackingCategories;
$wgCommonsMetadataForceRecalculate = 
$wmgCommonsMetadataForceRecalculate;
 }
@@ -2027,7 +2027,7 @@
}
 
// Citoid
-   require_once "$IP/extensions/Citoid/Citoid.php";
+   wfLoadExtension( 'Citoid' );
$wgCitoidServiceUrl = '//citoid.wikimedia.org/api';
 }
 
@@ -2149,7 +2149,7 @@
 }
 
 if ( $wmgUseBounceHandler ) {
-   require_once "$IP/extensions/BounceHandler/BounceHandler.php";
+   wfLoadExtension( 'BounceHandler' );
// $wmgVERPsecret is set in PrivateSettings.php
$wgVERPsecret = $wmgVERPsecret;
$wgVERPdomainPart = 'wikimedia.org';
@@ -2494,11 +2494,12 @@
 }
 
 if ( $wmgUseDisambiguator ) {
+   wfLoadExtension( 'Disambiguator' );
require_once( "$IP/extensions/Disambiguator/Disambiguator.php" );
 }
 
 if ( $wmgUseCodeEditorForCore || $wmgUseScribunto || $wmgZeroPortal ) {
-   include_once( "$IP/extensions/CodeEditor/CodeEditor.php" );
+   wfLoadExtension( 'CodeEditor' );
$wgCodeEditorEnableCore = $wmgUseCodeEditorForCore;
 }
 
@@ -2554,7 +2555,7 @@
 }
 
 if ( $wmgUseCreditsSource ) {
-   require_once( "$IP/extensions/CreditsSource/CreditsSource.php" );
+   wfLoadExtension( 'CreditsSource' );
 }
 
 if ( $wmgUseListings ) {
@@ -2665,7 +2666,7 @@
 }
 
 if ( $wmgUseContentTranslation ) {
-   require_once "$IP/extensions/ContentTranslation/ContentTranslation.php";
+   wfLoadExtension( 'ContentTranslation' );
// T76200: Public URL for cxserver instance
$wgContentTranslationSiteTemplates['cx'] = 
'//cxserver.wikimedia.org/v1';
// Used for html2wikitext when publishing
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 16e2c8e..b6ce908 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -4,7 +4,7 @@
 $IP/extensions/ApiSandbox/extension.json
 $IP/extensions/Babel/Babel.php
 $IP/extensions/BetaFeatures/extension.json
-$IP/extensions/BounceHandler/BounceHandler.php
+$IP/extensions/BounceHandler/extension.json
 $IP/extensions/Calendar/extension.json
 $IP/extensions/Campaigns/Campaigns.php
 $IP/extensions/CategoryTree/CategoryTree.php
@@ -13,25 +13,25 @@
 $IP/extensions/CharInsert/extension.json
 $IP/extensions/CheckUser/CheckUser.php
 $IP/extensions/CirrusSearch/CirrusSearch.php
-$IP/extensions/Cite/Cite.php
+$IP/extensions/Cite/extension.json
 $IP/extensions/CiteThisPage/extension.json
-$IP/extensions/Citoid/Citoid.php
+$IP/extensions/Citoid/extension.json
 $IP/extensions/cldr/cldr.php
 $IP/extensions/CleanChanges/CleanChanges.php
-$IP/extensions/CodeEditor/CodeEditor.php
+$IP/extensions/CodeEditor/extension.json
 $IP/extensions/CodeReview/extension.json
 $IP/extensions/Collection/Collection.php
-$IP/extensions/CommonsMetadata/CommonsMetadata.php
+$IP/extensions/CommonsMetadata/extension.json
 $IP/extensions/ConfirmEdit/ConfirmEdit.php
 $IP/extensions/ConfirmEdit/FancyCaptcha.php
 $IP/extensions/ContactPage/ContactPage.php
-$IP/extensions/ContentTranslation/ContentTranslation.php
+$IP/extensions/ContentTranslation/extension.json
 $IP/extensions/ContributionTracking/ContributionTracking.php
-$IP/extensions/CreditsSource/CreditsSource.php
+$IP/extensions/CreditsSource/extension.json
 $IP/extensions/CustomData/CustomData.php
 $IP/extensions/DisableAccount/DisableAcc