From 7e148dfbf068f501207faad6a9e509defe123859 Mon Sep 17 00:00:00 2001
From: Roan Kattouw <roan.kattouw@gmail.com>
Date: Fri, 7 Dec 2018 17:38:41 -0800
Subject: [PATCH] resourceloader: Add getConfig() method to
 ResourceLoaderContext

Change-Id: I38ece7320adab64113c5d2a91056d5522f369367
---
 includes/resourceloader/ResourceLoaderContext.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/includes/resourceloader/ResourceLoaderContext.php b/includes/resourceloader/ResourceLoaderContext.php
index 3ceb915d27..57392b97f8 100644
--- a/includes/resourceloader/ResourceLoaderContext.php
+++ b/includes/resourceloader/ResourceLoaderContext.php
@@ -74,7 +74,7 @@ class ResourceLoaderContext implements MessageLocalizer {
 		$this->user = $request->getRawVal( 'user' );
 		$this->debug = $request->getFuzzyBool(
 			'debug',
-			$resourceLoader->getConfig()->get( 'ResourceLoaderDebug' )
+			$this->getConfig()->get( 'ResourceLoaderDebug' )
 		);
 		$this->only = $request->getRawVal( 'only', null );
 		$this->version = $request->getRawVal( 'version', null );
@@ -89,7 +89,7 @@ class ResourceLoaderContext implements MessageLocalizer {
 		$skinnames = Skin::getSkinNames();
 		// If no skin is specified, or we don't recognize the skin, use the default skin
 		if ( !$this->skin || !isset( $skinnames[$this->skin] ) ) {
-			$this->skin = $resourceLoader->getConfig()->get( 'DefaultSkin' );
+			$this->skin = $this->getConfig()->get( 'DefaultSkin' );
 		}
 	}
 
@@ -149,6 +149,13 @@ class ResourceLoaderContext implements MessageLocalizer {
 		return $this->resourceLoader;
 	}
 
+	/**
+	 * @return Config
+	 */
+	public function getConfig() {
+		return $this->getResourceLoader()->getConfig();
+	}
+
 	/**
 	 * @return WebRequest
 	 */
@@ -181,7 +188,7 @@ class ResourceLoaderContext implements MessageLocalizer {
 			$lang = $this->getRequest()->getRawVal( 'lang', '' );
 			// Stricter version of RequestContext::sanitizeLangCode()
 			if ( !Language::isValidBuiltInCode( $lang ) ) {
-				$lang = $this->getResourceLoader()->getConfig()->get( 'LanguageCode' );
+				$lang = $this->getConfig()->get( 'LanguageCode' );
 			}
 			$this->language = $lang;
 		}
-- 
2.20.1