X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderImageModule.php;h=b711cbd17f8ff0fc4aeb3f79eccdad8ededc2d3f;hb=ee63d2bf20ea797e26391a1f08c1220950bca991;hp=26d5e982124c8bb6c9bbc6c43e4dd6265437d394;hpb=3ce5436159eabb35bc1e41968bc26a68b4a62cb4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderImageModule.php b/includes/resourceloader/ResourceLoaderImageModule.php
index 26d5e98212..b711cbd17f 100644
--- a/includes/resourceloader/ResourceLoaderImageModule.php
+++ b/includes/resourceloader/ResourceLoaderImageModule.php
@@ -39,6 +39,8 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 	protected $origin = self::ORIGIN_CORE_SITEWIDE;
 
 	protected $images = [];
+	protected $defaultColor = null;
+	protected $useDataURI = true;
 	protected $variants = [];
 	protected $prefix = null;
 	protected $selectorWithoutVariant = '.{prefix}-{name}';
@@ -50,7 +52,7 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 	 *
 	 * @param array $options List of options; if not given or empty, an empty module will be
 	 *     constructed
-	 * @param string $localBasePath Base path to prepend to all local paths in $options. Defaults
+	 * @param string|null $localBasePath Base path to prepend to all local paths in $options. Defaults
 	 *     to $IP
 	 *
 	 * Below is a description for the $options array:
@@ -182,6 +184,10 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 					$this->{$member} = $option;
 					break;
 
+				case 'useDataURI':
+					$this->{$member} = (bool)$option;
+					break;
+				case 'defaultColor':
 				case 'prefix':
 				case 'selectorWithoutVariant':
 				case 'selectorWithVariant':
@@ -264,7 +270,8 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 					$this->getName(),
 					$fileDescriptor,
 					$this->localBasePath,
-					$variantConfig
+					$variantConfig,
+					$this->defaultColor
 				);
 				$this->imageObjects[$skin][$image->getName()] = $image;
 			}
@@ -355,7 +362,7 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 		$script,
 		$variant = null
 	) {
-		$imageDataUri = $image->getDataUri( $context, $variant, 'original' );
+		$imageDataUri = $this->useDataURI ? $image->getDataUri( $context, $variant, 'original' ) : false;
 		$primaryUrl = $imageDataUri ?: $image->getUrl( $context, $script, $variant, 'original' );
 		$declarations = $this->getCssDeclarations(
 			$primaryUrl,
@@ -440,7 +447,7 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 	 * Extract a local base path from module definition information.
 	 *
 	 * @param array $options Module definition
-	 * @param string $localBasePath Path to use if not provided in module definition. Defaults
+	 * @param string|null $localBasePath Path to use if not provided in module definition. Defaults
 	 *     to $IP
 	 * @return string Local base path
 	 */