golem
/
MinervaNeue
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

No Minerva variables should be loaded on a non-Minerva skin 

Bug: T186062
Change-Id: I13c2ca804e92bc2ab839b370de48299c2ccd474f
This commit is contained in:
jdlrobson 2018-10-31 14:32:45 -07:00
parent 10eaabbeeb
commit dabb909887
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
includes/MinervaHooks.php
View File

@ -196,20 +196,22 @@ class MinervaHooks {
* These vars have a shorter cache-life than those in `getSkinConfigVariables`. * These vars have a shorter cache-life than those in `getSkinConfigVariables`.
* *
* @param array &$vars Array of variables to be added into the output of the RL startup module. * @param array &$vars Array of variables to be added into the output of the RL startup module.
* @param string $skin
* @return bool * @return bool
*/ */
public static function onResourceLoaderGetConfigVars( &$vars ) { public static function onResourceLoaderGetConfigVars( &$vars, $skin ) {
$config = MediaWikiServices::getInstance()->getConfigFactory() if ( $skin === 'minerva' ) {
->makeConfig( 'minerva' ); $config = MediaWikiServices::getInstance()->getConfigFactory()
->makeConfig( 'minerva' );
$vars += [ $vars += [
'wgMinervaSchemaMainMenuClickTrackingSampleRate' => 'wgMinervaSchemaMainMenuClickTrackingSampleRate' =>
$config->get( 'MinervaSchemaMainMenuClickTrackingSampleRate' ), $config->get( 'MinervaSchemaMainMenuClickTrackingSampleRate' ),
'wgMinervaABSamplingRate' => $config->get( 'MinervaABSamplingRate' ), 'wgMinervaABSamplingRate' => $config->get( 'MinervaABSamplingRate' ),
'wgMinervaCountErrors' => $config->get( 'MinervaCountErrors' ), 'wgMinervaCountErrors' => $config->get( 'MinervaCountErrors' ),
'wgMinervaErrorLogSamplingRate' => $config->get( 'MinervaErrorLogSamplingRate' ), 'wgMinervaErrorLogSamplingRate' => $config->get( 'MinervaErrorLogSamplingRate' ),
'wgMinervaReadOnly' => wfReadOnly() 'wgMinervaReadOnly' => wfReadOnly()
]; ];
}
return true; return true;
} }