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 "Add attributes parameter to ShowSearchHitTitle"
[lhc/web/wiklou.git]
/
includes
/
resourceloader
/
ResourceLoaderImageModule.php
diff --git
a/includes/resourceloader/ResourceLoaderImageModule.php
b/includes/resourceloader/ResourceLoaderImageModule.php
index
cbcf5a0
..
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] ) ) {
@@
-381,11
+381,13
@@
class ResourceLoaderImageModule extends ResourceLoaderModule {
* @return string[] CSS declarations to use given URIs as background-image
*/
protected function getCssDeclarations( $primary, $fallback ) {
* @return string[] CSS declarations to use given URIs as background-image
*/
protected function getCssDeclarations( $primary, $fallback ) {
+ $primaryUrl = CSSMin::buildUrlValue( $primary );
+ $fallbackUrl = CSSMin::buildUrlValue( $fallback );
return [
return [
- "background-image:
url($fallback)
;",
- "background-image: linear-gradient(transparent, transparent),
url($primary)
;",
+ "background-image:
$fallbackUrl
;",
+ "background-image: linear-gradient(transparent, transparent),
$primaryUrl
;",
// Do not serve SVG to Opera 12, bad rendering with border-radius or background-size (T87504)
// Do not serve SVG to Opera 12, bad rendering with border-radius or background-size (T87504)
- "background-image: -o-linear-gradient(transparent, transparent),
url($fallback)
;",
+ "background-image: -o-linear-gradient(transparent, transparent),
$fallbackUrl
;",
];
}
];
}