From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 30 Sep 2019 23:08:05 +0000 (-0700)
Subject: Avoid dynamic call to static method in ResourceLoaderModule::buildContent()
X-Git-Tag: 1.34.0-rc.0~36
X-Git-Url: http://git.cyclocoop.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=a65edcffc0cde2eb439138f6d66182df0c48fa46

Avoid dynamic call to static method in ResourceLoaderModule::buildContent()

Change-Id: I4e3d944b6468ad2f4bfc39532498d8ca38617689
---

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 )
 				];
 			}
 		}