Give MinervaNeue control of the minerva skin name

Change-Id: I7f004b43e11d88492b205a3584c29f72d26bad57
Depends-On: I985c4e3a88b59461d471945ccf74cd291db45a61
Bug: T166748
This commit is contained in:
jdlrobson 2017-06-30 11:32:39 -07:00
parent 2cc9516cde
commit b0df6367c2
2 changed files with 7 additions and 3 deletions

View file

@ -11,6 +11,7 @@
* Hook handler method names should be in the form of: * Hook handler method names should be in the form of:
* on<HookName>() * on<HookName>()
*/ */
use MediaWiki\MediaWikiServices;
class MinervaHooks { class MinervaHooks {
/** /**
@ -22,8 +23,9 @@ class MinervaHooks {
* @param array &$lessVars Variables already added * @param array &$lessVars Variables already added
*/ */
public static function onResourceLoaderGetLessVars( &$lessVars ) { public static function onResourceLoaderGetLessVars( &$lessVars ) {
// FIXME: Load from Minerva.Config when MobileFrontend and Minerva are separated $config = MediaWikiServices::getInstance()->getService( 'ConfigFactory' )
$config = MobileContext::singleton()->getMFConfig(); ->makeConfig( 'minerva' );
$lessVars = array_merge( $lessVars, $lessVars = array_merge( $lessVars,
[ [
'wgMinervaApplyKnownTemplateHacks' => "{$config->get( 'MinervaApplyKnownTemplateHacks' )}", 'wgMinervaApplyKnownTemplateHacks' => "{$config->get( 'MinervaApplyKnownTemplateHacks' )}",

View file

@ -507,7 +507,9 @@
} }
}, },
"ValidSkinNames": { "ValidSkinNames": {
"minerva-neue": "MinervaNeue" "minervaneue": "MinervaNeue",
"minerva-neue": "MinervaNeue",
"minerva": "Minerva"
}, },
"author": [], "author": [],
"config": { "config": {