From dabb909887a30a4ab4be0a7e5d32dcb430c3bb95 Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Wed, 31 Oct 2018 14:32:45 -0700
Subject: [PATCH] No Minerva variables should be loaded on a non-Minerva skin

Bug: T186062
Change-Id: I13c2ca804e92bc2ab839b370de48299c2ccd474f
---
 includes/MinervaHooks.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/includes/MinervaHooks.php b/includes/MinervaHooks.php
index 2ede615..3dd08df 100644
--- a/includes/MinervaHooks.php
+++ b/includes/MinervaHooks.php
@@ -196,20 +196,22 @@ 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 ) {
-		$config = MediaWikiServices::getInstance()->getConfigFactory()
-			->makeConfig( 'minerva' );
-
-		$vars += [
-			'wgMinervaSchemaMainMenuClickTrackingSampleRate' =>
-				$config->get( 'MinervaSchemaMainMenuClickTrackingSampleRate' ),
-			'wgMinervaABSamplingRate' => $config->get( 'MinervaABSamplingRate' ),
-			'wgMinervaCountErrors' => $config->get( 'MinervaCountErrors' ),
-			'wgMinervaErrorLogSamplingRate' => $config->get( 'MinervaErrorLogSamplingRate' ),
-			'wgMinervaReadOnly' => wfReadOnly()
-		];
+	public static function onResourceLoaderGetConfigVars( &$vars, $skin ) {
+		if ( $skin === 'minerva' ) {
+			$config = MediaWikiServices::getInstance()->getConfigFactory()
+				->makeConfig( 'minerva' );
+			$vars += [
+				'wgMinervaSchemaMainMenuClickTrackingSampleRate' =>
+					$config->get( 'MinervaSchemaMainMenuClickTrackingSampleRate' ),
+				'wgMinervaABSamplingRate' => $config->get( 'MinervaABSamplingRate' ),
+				'wgMinervaCountErrors' => $config->get( 'MinervaCountErrors' ),
+				'wgMinervaErrorLogSamplingRate' => $config->get( 'MinervaErrorLogSamplingRate' ),
+				'wgMinervaReadOnly' => wfReadOnly()
+			];
+		}
 
 		return true;
 	}