X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderImage.php;h=072ae7944b177af4842c3a29a8135e1c0639a774;hb=cfdc440d40a02675189ddc47edbf19d339bcb9d7;hp=2503b22e5902a111e55c36160a5605e62b5ec6f1;hpb=c8d361a38027ef5d808225b8a83f15417248aa67;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderImage.php b/includes/resourceloader/ResourceLoaderImage.php
index 2503b22e59..072ae7944b 100644
--- a/includes/resourceloader/ResourceLoaderImage.php
+++ b/includes/resourceloader/ResourceLoaderImage.php
@@ -67,23 +67,27 @@ class ResourceLoaderImage {
 				}
 			}
 		}
+		// Remove 'deprecated' key
+		if ( is_array( $this->descriptor ) ) {
+			unset( $this->descriptor[ 'deprecated' ] );
+		}
 
 		// Ensure that all files have common extension.
 		$extensions = [];
-		$descriptor = (array)$descriptor;
+		$descriptor = (array)$this->descriptor;
 		array_walk_recursive( $descriptor, function ( $path ) use ( &$extensions ) {
 			$extensions[] = pathinfo( $path, PATHINFO_EXTENSION );
 		} );
 		$extensions = array_unique( $extensions );
 		if ( count( $extensions ) !== 1 ) {
 			throw new InvalidArgumentException(
-				"File type for different image files of '$name' not the same"
+				"File type for different image files of '$name' not the same in module '$module'"
 			);
 		}
 		$ext = $extensions[0];
 		if ( !isset( self::$fileTypes[$ext] ) ) {
 			throw new InvalidArgumentException(
-				"Invalid file type for image files of '$name' (valid: svg, png, gif, jpg)"
+				"Invalid file type for image files of '$name' (valid: svg, png, gif, jpg) in module '$module'"
 			);
 		}
 		$this->extension = $ext;
@@ -144,9 +148,8 @@ class ResourceLoaderImage {
 	public function getExtension( $format = 'original' ) {
 		if ( $format === 'rasterized' && $this->extension === 'svg' ) {
 			return 'png';
-		} else {
-			return $this->extension;
 		}
+		return $this->extension;
 	}
 
 	/**
@@ -176,6 +179,7 @@ class ResourceLoaderImage {
 			'variant' => $variant,
 			'format' => $format,
 			'lang' => $context->getLanguage(),
+			'skin' => $context->getSkin(),
 			'version' => $context->getVersion(),
 		];