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 "Remove obsolete `color` property from horizontal rule"
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoaderFileModule.php
diff --git
a/includes/resourceloader/ResourceLoaderFileModule.php
b/includes/resourceloader/ResourceLoaderFileModule.php
index
9be5de3
..
031541b
100644
(file)
--- a/
includes/resourceloader/ResourceLoaderFileModule.php
+++ b/
includes/resourceloader/ResourceLoaderFileModule.php
@@
-385,7
+385,7
@@
class ResourceLoaderFileModule extends ResourceLoaderModule {
if ( $this->packageFiles !== null ) {
$packageFiles = $this->getPackageFiles( $context );
if ( $deprecationScript ) {
if ( $this->packageFiles !== null ) {
$packageFiles = $this->getPackageFiles( $context );
if ( $deprecationScript ) {
- $mainFile =& $packageFiles['files'][
$packageFiles['main']
];
+ $mainFile =& $packageFiles['files'][
$packageFiles['main']
];
$mainFile['content'] = $deprecationScript . $mainFile['content'];
}
return $packageFiles;
$mainFile['content'] = $deprecationScript . $mainFile['content'];
}
return $packageFiles;