X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderImageModule.php;h=0585cfdbe776d829c8de02524b99e4f8791a2c28;hp=90b18ebd9cac469df5ac8d7fd7f29920c2b87825;hb=fa0f6f34972c0e0f4aac24a03b3efdfc45f256f6;hpb=efe7286cac744ccc7bce5417d20601a387f6d1ad

diff --git a/includes/resourceloader/ResourceLoaderImageModule.php b/includes/resourceloader/ResourceLoaderImageModule.php
index 90b18ebd9c..0585cfdbe7 100644
--- a/includes/resourceloader/ResourceLoaderImageModule.php
+++ b/includes/resourceloader/ResourceLoaderImageModule.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * ResourceLoader module for generated and embedded images.
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -22,8 +20,9 @@
  */
 
 /**
- * ResourceLoader module for generated and embedded images.
+ * Module for generated and embedded images.
  *
+ * @ingroup ResourceLoader
  * @since 1.25
  */
 class ResourceLoaderImageModule extends ResourceLoaderModule {
@@ -130,7 +129,7 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 		$this->definition = null;
 
 		if ( isset( $options['data'] ) ) {
-			$dataPath = $this->localBasePath . '/' . $options['data'];
+			$dataPath = $this->getLocalPath( $options['data'] );
 			$data = json_decode( file_get_contents( $dataPath ), true );
 			$options = array_merge( $data, $options );
 		}
@@ -259,7 +258,7 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 				$this->images[$skin] = $this->images['default'] ?? [];
 			}
 			foreach ( $this->images[$skin] as $name => $options ) {
-				$fileDescriptor = is_string( $options ) ? $options : $options['file'];
+				$fileDescriptor = is_array( $options ) ? $options['file'] : $options;
 
 				$allowedVariants = array_merge(
 					( is_array( $options ) && isset( $options['variants'] ) ) ? $options['variants'] : [],
@@ -452,6 +451,18 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 		return array_map( [ __CLASS__, 'safeFileHash' ], $files );
 	}
 
+	/**
+	 * @param string|ResourceLoaderFilePath $path
+	 * @return string
+	 */
+	protected function getLocalPath( $path ) {
+		if ( $path instanceof ResourceLoaderFilePath ) {
+			return $path->getLocalPath();
+		}
+
+		return "{$this->localBasePath}/$path";
+	}
+
 	/**
 	 * Extract a local base path from module definition information.
 	 *