Merge "No Minerva variables should be loaded on a non-Minerva skin"
This commit is contained in:
commit
880607b55a
|
@ -196,12 +196,13 @@ class MinervaHooks {
|
|||
* 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 string $skin
|
||||
* @return bool
|
||||
*/
|
||||
public static function onResourceLoaderGetConfigVars( &$vars ) {
|
||||
public static function onResourceLoaderGetConfigVars( &$vars, $skin ) {
|
||||
if ( $skin === 'minerva' ) {
|
||||
$config = MediaWikiServices::getInstance()->getConfigFactory()
|
||||
->makeConfig( 'minerva' );
|
||||
|
||||
$vars += [
|
||||
'wgMinervaSchemaMainMenuClickTrackingSampleRate' =>
|
||||
$config->get( 'MinervaSchemaMainMenuClickTrackingSampleRate' ),
|
||||
|
@ -210,6 +211,7 @@ class MinervaHooks {
|
|||
'wgMinervaErrorLogSamplingRate' => $config->get( 'MinervaErrorLogSamplingRate' ),
|
||||
'wgMinervaReadOnly' => wfReadOnly()
|
||||
];
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue