X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderImage.php;h=6a6a3c24d5e265aaf6a19aedaaf69a5f68bd14c5;hb=ecc01d14d5a067989d2d316a410d812dfe62dcc8;hp=f784d0346c397feebd639d0027217cde8b3fec00;hpb=a5b975edd132e52ee8ce1c725d8195da941c8b7b;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/resourceloader/ResourceLoaderImage.php b/includes/resourceloader/ResourceLoaderImage.php index f784d0346c..6a6a3c24d5 100644 --- a/includes/resourceloader/ResourceLoaderImage.php +++ b/includes/resourceloader/ResourceLoaderImage.php @@ -54,8 +54,8 @@ class ResourceLoaderImage { $this->variants = $variants; // Expand shorthands: - // array( "en,de,fr" => "foo.svg" ) - // → array( "en" => "foo.svg", "de" => "foo.svg", "fr" => "foo.svg" ) + // [ "en,de,fr" => "foo.svg" ] + // → [ "en" => "foo.svg", "de" => "foo.svg", "fr" => "foo.svg" ] if ( is_array( $this->descriptor ) && isset( $this->descriptor['lang'] ) ) { foreach ( array_keys( $this->descriptor['lang'] ) as $langList ) { if ( strpos( $langList, ',' ) !== false ) { @@ -176,10 +176,11 @@ class ResourceLoaderImage { 'variant' => $variant, 'format' => $format, 'lang' => $context->getLanguage(), + 'skin' => $context->getSkin(), 'version' => $context->getVersion(), ]; - return wfExpandUrl( wfAppendQuery( $script, $query ), PROTO_RELATIVE ); + return wfAppendQuery( $script, $query ); } /**