dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes Ic13414f0,I26085bfc
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoaderContext.php
diff --git
a/includes/resourceloader/ResourceLoaderContext.php
b/includes/resourceloader/ResourceLoaderContext.php
index
4588015
..
22ff6a7
100644
(file)
--- a/
includes/resourceloader/ResourceLoaderContext.php
+++ b/
includes/resourceloader/ResourceLoaderContext.php
@@
-96,7
+96,7
@@
class ResourceLoaderContext {
$pos = strrpos( $group, '.' );
if ( $pos === false ) {
// Prefixless modules, i.e. without dots
$pos = strrpos( $group, '.' );
if ( $pos === false ) {
// Prefixless modules, i.e. without dots
- $retval =
explode( ',', $group
);
+ $retval =
array_merge( $retval, explode( ',', $group )
);
} else {
// We have a prefix and a bunch of suffixes
$prefix = substr( $group, 0, $pos ); // 'foo'
} else {
// We have a prefix and a bunch of suffixes
$prefix = substr( $group, 0, $pos ); // 'foo'