From: Ori Livneh <ori@wikimedia.org>
Date: Fri, 2 Oct 2015 00:36:38 +0000 (-0700)
Subject: Fix-up for I21bb3f08e7f: ResourceLoaderModule::expandRelativePaths
X-Git-Tag: 1.31.0-rc.0~9594
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=60dcbf48e7b8f966e73ee4dd1e7b55ca09a94b0f

Fix-up for I21bb3f08e7f: ResourceLoaderModule::expandRelativePaths

ResourceLoaderModule::expandRelativePaths(), not ResourceLoader::expandRelativePaths().

Change-Id: Ibb2a8398641d360240889988189d2ef51f114c0b
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index 236e5292b2..31b3651e70 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -122,7 +122,7 @@ class ResourceLoader implements LoggerAwareInterface {
 		foreach ( $res as $row ) {
 			$module = $this->getModule( $row->md_module );
 			if ( $module ) {
-				$module->setFileDependencies( $context, ResourceLoader::expandRelativePaths(
+				$module->setFileDependencies( $context, ResourceLoaderModule::expandRelativePaths(
 					FormatJson::decode( $row->md_deps, true )
 				) );
 				$modulesWithDeps[] = $row->md_module;