Hello Chad, Niedzielski, jenkins-bot, Jdlrobson,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/365187
to review the following change.
Change subject: Revert "Give MinervaNeue control of the minerva skin name"
......................................................................
Revert "Give MinervaNeue control of the minerva skin name"
This reverts commit 6ce6d6f48addcd04175849624f7161a11407b00a.
Change-Id: Ic4e31db657745459a0d9e485b9b9deb6de2a26ae
---
M includes/Minerva.hooks.php
M skin.json
2 files changed, 3 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/87/365187/1
diff --git a/includes/Minerva.hooks.php b/includes/Minerva.hooks.php
index dcb2894..ea58ee7 100644
--- a/includes/Minerva.hooks.php
+++ b/includes/Minerva.hooks.php
@@ -11,7 +11,6 @@
* Hook handler method names should be in the form of:
* on<HookName>()
*/
-use MediaWiki\MediaWikiServices;
class MinervaHooks {
/**
@@ -23,9 +22,8 @@
* @param array &$lessVars Variables already added
*/
public static function onResourceLoaderGetLessVars( &$lessVars ) {
- $config = MediaWikiServices::getInstance()->getService(
'ConfigFactory' )
- ->makeConfig( 'minerva' );
-
+ // FIXME: Load from Minerva.Config when MobileFrontend and
Minerva are separated
+ $config = MobileContext::singleton()->getMFConfig();
$lessVars = array_merge( $lessVars,
[
'wgMinervaApplyKnownTemplateHacks' =>
"{$config->get( 'MinervaApplyKnownTemplateHacks' )}",
diff --git a/skin.json b/skin.json
index addfeff..c08d450 100644
--- a/skin.json
+++ b/skin.json
@@ -507,9 +507,7 @@
}
},
"ValidSkinNames": {
- "minervaneue": "MinervaNeue",
- "minerva-neue": "MinervaNeue",
- "minerva": "Minerva"
+ "minerva-neue": "MinervaNeue"
},
"author": [],
"config": {
--
To view, visit https://gerrit.wikimedia.org/r/365187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4e31db657745459a0d9e485b9b9deb6de2a26ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: wmf/1.30.0-wmf.9
Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
