Merge "No Minerva variables should be loaded on a non-Minerva skin"
This commit is contained in:
commit
880607b55a
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue