Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/351922 )
Change subject: Clean up inappropriate usages of wmg
......................................................................
Clean up inappropriate usages of wmg
Assuming that appropriate usage is only for things that
are not actually config variables (unless noted otherwise)
wmgExtractsRemoveClasses - looks like this can be removed as dates back
to TextExtracts pre-extension loading
wmgExtractsExtendOpenSearchXml - simple boolean. No reason to use wmg
wmgMFEditorOptions - redunant this is true by default and actually inert
'wmgRelatedArticlesShowInSidebar and wmgRelatedArticlesShowInFooter
depend on each other so this makes sense
wmgRelatedArticlesFooterWhitelistedSkins - exists due to T142663
Bug: T151891
Change-Id: I9704634f2c6f57973db49e57aaa27f2ae1850e38
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 2 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/22/351922/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 526637c..4bce125 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2332,13 +2332,6 @@
# MUST be after MobileFrontend initialization
if ( $wmgEnableTextExtracts ) {
wfLoadExtension( 'TextExtracts' );
- if ( isset( $wgExtractsRemoveClasses ) ) {
- // Back-compat for pre-extension.json
- $wgExtractsRemoveClasses = array_merge(
$wgExtractsRemoveClasses, $wmgExtractsRemoveClasses );
- } else {
- $wgExtractsRemoveClasses = $wmgExtractsRemoveClasses;
- }
- $wgExtractsExtendOpenSearchXml = $wmgExtractsExtendOpenSearchXml;
}
if ( $wmgUseSubPageList3 ) {
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 35e355d..c1a43f9 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14963,7 +14963,7 @@
'wmgEnableTextExtracts' => [
'default' => true,
],
-'wmgExtractsRemoveClasses' => [
+'wgExtractsRemoveClasses' => [
'default' => [
// This is a good thing to remove in any case
'.metadata',
@@ -14971,7 +14971,7 @@
'span.coordinates', 'span.geo-multi-punct',
'span.geo-nondefault', '#coordinates',
],
],
-'wmgExtractsExtendOpenSearchXml' => [
+'wgExtractsExtendOpenSearchXml' => [
'default' => true,
],
@@ -15273,13 +15273,6 @@
'default' => [
'base' => false,
'beta' => true,
- ],
-],
-
-// Enable editing for unregistered users
-'wmgMFEditorOptions' => [
- 'default' => [
- 'anonymousEditing' => true, // T93210
],
],
--
To view, visit https://gerrit.wikimedia.org/r/351922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9704634f2c6f57973db49e57aaa27f2ae1850e38
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
