jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356507 )
Change subject: Replace MFContentNamespace with wgContentNamespaces
......................................................................
Replace MFContentNamespace with wgContentNamespaces
wgContentNamespaces exists and replicates the functionality of
this config so let's get rid of it! Yay!
Bug: T167077
Change-Id: I9861d9f18a137ec6d14284c6b53165d723845cc2
---
M README.md
M extension.json
M includes/MobileFrontend.hooks.php
M includes/skins/SkinMinerva.php
M resources/mobile.nearby/NearbyGateway.js
5 files changed, 2 insertions(+), 14 deletions(-)
Approvals:
Pmiazga: Looks good to me, approved
jenkins-bot: Verified
diff --git a/README.md b/README.md
index aa97bfc..6857d47 100644
--- a/README.md
+++ b/README.md
@@ -570,14 +570,6 @@
* Type: `Boolean`
* Default: `false`
-#### $wgMFContentNamespace
-
-The content namespace(s) that *Special:Nearby* and *Special:Random* should use.
-Should be one or more of `NS_*` constants, pipe-separated.
-
-* Type: `Integer|String`
-* Default: `NS_MAIN`
-
#### $wgMFDefaultSkinClass
The default skin for MobileFrontend.
diff --git a/extension.json b/extension.json
index 7c8f826..c2b5f35 100644
--- a/extension.json
+++ b/extension.json
@@ -1822,7 +1822,6 @@
"MinervaCustomLogos": [],
"MobileFrontendLogo": false,
"MFEnableBeta": false,
- "MFContentNamespace": 0,
"MFDefaultSkinClass": "SkinMinerva",
"MinervaApplyKnownTemplateHacks": false,
"MinervaPrintStyles": {
diff --git a/includes/MobileFrontend.hooks.php
b/includes/MobileFrontend.hooks.php
index 525410e..a2c5685 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -415,7 +415,6 @@
'tiny' => MobilePage::TINY_IMAGE_WIDTH,
'small' => MobilePage::SMALL_IMAGE_WIDTH,
],
- 'wgMFContentNamespace' => $config->get(
'MFContentNamespace' ),
'wgMFEditorOptions' => $config->get( 'MFEditorOptions'
),
'wgMFLicense' => MobileFrontendSkinHooks::getLicense(
'editor' ),
'wgMFSchemaEditSampleRate' => $config->get(
'MFSchemaEditSampleRate' ),
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 3439300..7a5a7e6 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -648,9 +648,7 @@
$menu->insert( 'random' )
->addComponent(
$this->msg( 'mobile-frontend-random-button'
)->escaped(),
- SpecialPage::getTitleFor( 'Randompage',
- MWNamespace::getCanonicalName(
$config->get( 'MFContentNamespace' ) ) )->getLocalUrl() .
- '#/random',
+ SpecialPage::getTitleFor( 'Randompage'
)->getLocalUrl() . '#/random',
MobileUI::iconClass( 'mf-random', 'before' ),
[
'id' => 'randomButton',
diff --git a/resources/mobile.nearby/NearbyGateway.js
b/resources/mobile.nearby/NearbyGateway.js
index 39638a5..b788db0 100644
--- a/resources/mobile.nearby/NearbyGateway.js
+++ b/resources/mobile.nearby/NearbyGateway.js
@@ -1,7 +1,7 @@
( function ( M, $ ) {
var limit = 50,
Page = M.require( 'mobile.startup/Page' ),
- ns = mw.config.get( 'wgMFContentNamespace' ),
+ ns = mw.config.get( 'wgContentNamespaces' ),
extendSearchParams = M.require(
'mobile.search.util/extendSearchParams' );
/**
--
To view, visit https://gerrit.wikimedia.org/r/356507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9861d9f18a137ec6d14284c6b53165d723845cc2
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Pmiazga <pmia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
