Zfilipin has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/373043 )
Change subject: relatedArticles: Tidy up config
......................................................................
relatedArticles: Tidy up config
The sidebar feature has been removed, meaning that Related Articles now
always operates as if wgRelatedArticlesShowInFooter were true.
We can now safely remove the ShowIn* config variables.
Bug: T165991
Change-Id: Ia79435a9f15b84b542875387d66c27b6e3a5d004
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 4 insertions(+), 11 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2b98209..01a18e3 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2945,13 +2945,10 @@
if ( $wmgUseRelatedArticles ) {
wfLoadExtension( 'RelatedArticles' );
- if ( $wmgRelatedArticlesShowInFooter ) {
- $wgRelatedArticlesShowInSidebar = false;
- $wgRelatedArticlesShowInFooter = true;
- $wgRelatedArticlesLoggingBucketSize = 0.01;
- $wgRelatedArticlesUseCirrusSearch =
$wmgRelatedArticlesUseCirrusSearch;
- $wgRelatedArticlesOnlyUseCirrusSearch = false;
- }
+
+ $wgRelatedArticlesLoggingBucketSize = 0.01;
+ $wgRelatedArticlesUseCirrusSearch = $wmgRelatedArticlesUseCirrusSearch;
+ $wgRelatedArticlesOnlyUseCirrusSearch = false;
}
// Workaround for T142663 - override flat arrays
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 0e53550..2462d46 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17631,10 +17631,6 @@
'frwikinews' => true, // T143480
],
-'wmgRelatedArticlesShowInFooter' => [
- 'default' => true, // T164391, T143480
-],
-
'wgRelatedArticlesCardLimit' => [
'default' => 3,
'wikivoyage' => 9,
--
To view, visit https://gerrit.wikimedia.org/r/373043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia79435a9f15b84b542875387d66c27b6e3a5d004
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Phuedx <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Urbanecm <[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
