Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/246285
Change subject: Revert "Load some more extensions directly through
wfLoadExtension() (B-D)"
......................................................................
Revert "Load some more extensions directly through wfLoadExtension() (B-D)"
This reverts commit 04f5f8d5057ae7fd68d92873425e62835e45af19.
Change-Id: I8a2c52ef2613fdda2dd94ce3a244b0775f142128
---
M wmf-config/CommonSettings.php
M wmf-config/extension-list
2 files changed, 17 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/85/246285/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f30edf5..c7037ec 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -529,7 +529,7 @@
$wgExpensiveParserFunctionLimit = 500;
if ( $wmgUseCite ) {
- wfLoadExtension( 'Cite' );
+ require( $IP . '/extensions/Cite/Cite.php' );
}
if ( $wmgUseCiteThisPage ) {
@@ -1278,7 +1278,7 @@
// taking it live 2006-12-15 brion
if ( $wmgUseDismissableSiteNotice ) {
- wfLoadExtension( 'DismissableSiteNotice' );
+ require(
"$IP/extensions/DismissableSiteNotice/DismissableSiteNotice.php" );
$wgDismissableSiteNoticeForAnons = true; // T59732
}
$wgMajorSiteNoticeID = '2';
@@ -1851,7 +1851,7 @@
}
if ( $wmgUseCommonsMetadata ) {
- wfLoadExtension( 'CommonsMetadata' );
+ require_once( "$IP/extensions/CommonsMetadata/CommonsMetadata.php" );
$wgCommonsMetadataSetTrackingCategories =
$wmgCommonsMetadataSetTrackingCategories;
$wgCommonsMetadataForceRecalculate =
$wmgCommonsMetadataForceRecalculate;
}
@@ -2020,7 +2020,7 @@
}
// Citoid
- wfLoadExtension( 'Citoid' );
+ require_once "$IP/extensions/Citoid/Citoid.php";
$wgCitoidServiceUrl = '//citoid.wikimedia.org/api';
}
@@ -2146,7 +2146,7 @@
}
if ( $wmgUseBounceHandler ) {
- wfLoadExtension( 'BounceHandler' );
+ require_once "$IP/extensions/BounceHandler/BounceHandler.php";
// $wmgVERPsecret is set in PrivateSettings.php
$wgVERPsecret = $wmgVERPsecret;
$wgVERPdomainPart = 'wikimedia.org';
@@ -2494,12 +2494,11 @@
}
if ( $wmgUseDisambiguator ) {
- wfLoadExtension( 'Disambiguator' );
require_once( "$IP/extensions/Disambiguator/Disambiguator.php" );
}
if ( $wmgUseCodeEditorForCore || $wmgUseScribunto || $wmgZeroPortal ) {
- wfLoadExtension( 'CodeEditor' );
+ include_once( "$IP/extensions/CodeEditor/CodeEditor.php" );
$wgCodeEditorEnableCore = $wmgUseCodeEditorForCore;
if ( $wgDBname === 'metawiki' ) {
$wgHooks['CodeEditorGetPageLanguage'][] = function ( Title
$title, &$lang ) {
@@ -2563,7 +2562,7 @@
}
if ( $wmgUseCreditsSource ) {
- wfLoadExtension( 'CreditsSource' );
+ require_once( "$IP/extensions/CreditsSource/CreditsSource.php" );
}
if ( $wmgUseListings ) {
@@ -2675,7 +2674,7 @@
}
if ( $wmgUseContentTranslation ) {
- wfLoadExtension( 'ContentTranslation' );
+ require_once "$IP/extensions/ContentTranslation/ContentTranslation.php";
// 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 b8f84b3..9d579cf 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/extension.json
+$IP/extensions/BounceHandler/BounceHandler.php
$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/extension.json
+$IP/extensions/Cite/Cite.php
$IP/extensions/CiteThisPage/extension.json
-$IP/extensions/Citoid/extension.json
+$IP/extensions/Citoid/Citoid.php
$IP/extensions/cldr/cldr.php
$IP/extensions/CleanChanges/CleanChanges.php
-$IP/extensions/CodeEditor/extension.json
+$IP/extensions/CodeEditor/CodeEditor.php
$IP/extensions/CodeReview/extension.json
$IP/extensions/Collection/Collection.php
-$IP/extensions/CommonsMetadata/extension.json
+$IP/extensions/CommonsMetadata/CommonsMetadata.php
$IP/extensions/ConfirmEdit/ConfirmEdit.php
$IP/extensions/ConfirmEdit/FancyCaptcha.php
$IP/extensions/ContactPage/ContactPage.php
-$IP/extensions/ContentTranslation/extension.json
+$IP/extensions/ContentTranslation/ContentTranslation.php
$IP/extensions/ContributionTracking/ContributionTracking.php
-$IP/extensions/CreditsSource/extension.json
+$IP/extensions/CreditsSource/CreditsSource.php
$IP/extensions/CustomData/CustomData.php
$IP/extensions/DisableAccount/DisableAccount.php
-$IP/extensions/Disambiguator/extension.json
-$IP/extensions/DismissableSiteNotice/extension.json
+$IP/extensions/Disambiguator/Disambiguator.php
+$IP/extensions/DismissableSiteNotice/DismissableSiteNotice.php
$IP/extensions/DonationInterface/donationinterface_langonly.php
$IP/extensions/DoubleWiki/DoubleWiki.php
$IP/extensions/Echo/Echo.php
--
To view, visit https://gerrit.wikimedia.org/r/246285
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a2c52ef2613fdda2dd94ce3a244b0775f142128
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
