dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
169b7b9
)
resourceloader: Fix-up missing expandRelativePaths() in preloadModuleInfo
author
Timo Tijhof
<krinklemail@gmail.com>
Fri, 2 Oct 2015 00:14:19 +0000
(17:14 -0700)
committer
Timo Tijhof
<krinklemail@gmail.com>
Fri, 2 Oct 2015 00:14:19 +0000
(17:14 -0700)
Follows-up
280d292
.
Change-Id: I21bb3f08e7fc9c6b364df2934640c2d5ce1e86b0
includes/resourceloader/ResourceLoader.php
patch
|
blob
|
history
diff --git
a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index
e2d3990
..
236e529
100644
(file)
--- 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;
}
}