From a65edcffc0cde2eb439138f6d66182df0c48fa46 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 30 Sep 2019 16:08:05 -0700
Subject: [PATCH] Avoid dynamic call to static method in
 ResourceLoaderModule::buildContent()

Change-Id: I4e3d944b6468ad2f4bfc39532498d8ca38617689
---
 includes/resourceloader/ResourceLoaderModule.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php
index eca3a97396..b4a0f465c8 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -697,7 +697,6 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
 	 * @return array
 	 */
 	final protected function buildContent( ResourceLoaderContext $context ) {
-		$rl = $context->getResourceLoader();
 		$stats = MediaWikiServices::getInstance()->getStatsdDataFactory();
 		$statStart = microtime( true );
 
@@ -766,7 +765,7 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
 				}
 				// Wrap styles into @media groups as needed and flatten into a numerical array
 				$styles = [
-					'css' => $rl->makeCombinedStyles( $stylePairs )
+					'css' => ResourceLoader::makeCombinedStyles( $stylePairs )
 				];
 			}
 		}
-- 
2.20.1