jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365803 )
Change subject: Simplify onResourceLoaderGetLessVars hook
......................................................................
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
---
M includes/Minerva.hooks.php
1 file changed, 2 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
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 @@
* @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' );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/365803
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4c138fb3b83e6e9c6ff9a001dd39e03ca5029b1
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
