jenkins-bot has submitted this change and it was merged.
Change subject: ContentTranslation: Use wfLoadExtension()
......................................................................
ContentTranslation: Use wfLoadExtension()
Was loudest warning when we briefly turned on warning logging. Ext
is ready for wfLoadExtension() use so we'll do it.
Change-Id: I5fead02b9a7dc099f2892a30f8e2799a60be03ff
---
M wmf-config/CommonSettings.php
M wmf-config/extension-list
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Chad: Looks good to me, approved
Legoktm: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ad7aa97..39fcf00 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2666,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 fce7e9b..dbbbd89 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -25,7 +25,7 @@
$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/CustomData/CustomData.php
--
To view, visit https://gerrit.wikimedia.org/r/248938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5fead02b9a7dc099f2892a30f8e2799a60be03ff
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: KartikMistry <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
