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
objectcache: use INTERIM_KEY_TTL constant in WANObjectCache for readability
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoaderImageModule.php
diff --git
a/includes/resourceloader/ResourceLoaderImageModule.php
b/includes/resourceloader/ResourceLoaderImageModule.php
index
8b54959
..
71a0fa2
100644
(file)
--- a/
includes/resourceloader/ResourceLoaderImageModule.php
+++ b/
includes/resourceloader/ResourceLoaderImageModule.php
@@
-249,7
+249,7
@@
class ResourceLoaderImageModule extends ResourceLoaderModule {
$fileDescriptor = is_string( $options ) ? $options : $options['file'];
$allowedVariants = array_merge(
$fileDescriptor = is_string( $options ) ? $options : $options['file'];
$allowedVariants = array_merge(
-
is_array( $options ) && isset( $options['variants']
) ? $options['variants'] : [],
+
( is_array( $options ) && isset( $options['variants'] )
) ? $options['variants'] : [],
$this->getGlobalVariants( $context )
);
if ( isset( $this->variants[$skin] ) ) {
$this->getGlobalVariants( $context )
);
if ( isset( $this->variants[$skin] ) ) {