From f7509adfbbacf77329b9f55dbddd736c748ad696 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Mon, 17 Jul 2017 13:58:14 -0700 Subject: [PATCH] Simplify onResourceLoaderGetLessVars hook * Get ConfigFactory via its accessor, not getService() * Avoid array_merge, use simpler syntax * Don't use string interpolation when one variable is the entire string Change-Id: Ic4c138fb3b83e6e9c6ff9a001dd39e03ca5029b1 --- includes/Minerva.hooks.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/includes/Minerva.hooks.php b/includes/Minerva.hooks.php index dcb2894..f12bd4a 100644 --- a/includes/Minerva.hooks.php +++ b/includes/Minerva.hooks.php @@ -23,14 +23,10 @@ class MinervaHooks { * @param array &$lessVars Variables already added */ public static function onResourceLoaderGetLessVars( &$lessVars ) { - $config = MediaWikiServices::getInstance()->getService( 'ConfigFactory' ) + $config = MediaWikiServices::getInstance()->getConfigFactory() ->makeConfig( 'minerva' ); - $lessVars = array_merge( $lessVars, - [ - 'wgMinervaApplyKnownTemplateHacks' => "{$config->get( 'MinervaApplyKnownTemplateHacks' )}", - ] - ); + $lessVars['wgMinervaApplyKnownTemplateHacks'] = $config->get( 'MinervaApplyKnownTemplateHacks' ); } /**