From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 2 Oct 2015 00:14:19 +0000 (-0700)
Subject: resourceloader: Fix-up missing expandRelativePaths() in preloadModuleInfo
X-Git-Tag: 1.31.0-rc.0~9595^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=66b2060d22c4c56a0879e541fd5dfd7728d92c6d;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Fix-up missing expandRelativePaths() in preloadModuleInfo

Follows-up 280d292.

Change-Id: I21bb3f08e7fc9c6b364df2934640c2d5ce1e86b0
---

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