jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/341127 )
Change subject: Remove Wikibase vs Interwikisorting checks
......................................................................
Remove Wikibase vs Interwikisorting checks
The dependant change should be merged, in the Wikidata build
and also deployed before this change is deployed.
This was merged just after the 1.29.0-wmf.19 branch and thus
once the 1.29.0-wmf.20+ branches are deployed this change can
be merged.
Bug: T150183
Change-Id: I0b0344ea524ca4a27b30b11437c965a733f2e403
Depends-On: I221802a136de5e5bb576d9ab00fb1b64eda53965
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 6 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
Hashar: 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 e8b0962..14c6bd6 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3085,14 +3085,9 @@
$wgCognateNamespaces = [ 0 ];
}
-if ( $wmgUseWikibaseClient || $wmgUseInterwikiSorting ) {
- $wgInterwikiSortingInterwikiSortOrders = include
"$wmfConfigDir/InterwikiSortOrders.php";
-}
-
if ( $wmgUseInterwikiSorting ) {
+ $wgInterwikiSortingInterwikiSortOrders = include
"$wmfConfigDir/InterwikiSortOrders.php";
wfLoadExtension( 'InterwikiSorting' );
- // This setting must be set before loading WikibaseClient
- $wgWikibaseInterwikiSorting = false;
}
if ( $wmgUseWikibaseRepo || $wmgUseWikibaseClient ) {
--
To view, visit https://gerrit.wikimedia.org/r/341127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b0344ea524ca4a27b30b11437c965a733f2e403
Gerrit-PatchSet: 7
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Zfilipin <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
