From 66b2060d22c4c56a0879e541fd5dfd7728d92c6d Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Thu, 1 Oct 2015 17:14:19 -0700 Subject: [PATCH] resourceloader: Fix-up missing expandRelativePaths() in preloadModuleInfo Follows-up 280d292. Change-Id: I21bb3f08e7fc9c6b364df2934640c2d5ce1e86b0 --- includes/resourceloader/ResourceLoader.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; } } -- 2.20.1