From: jdlrobson <jdlrobson@gmail.com>
Date: Thu, 5 Jul 2018 23:51:30 +0000 (-0700)
Subject: Allow ResourceLoaderImage modules without data URIs
X-Git-Tag: 1.34.0-rc.0~4845^2
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=36252b71da863c3c17c037779def2ef02d8e4c08;p=lhc%2Fweb%2Fwiklou.git

Allow ResourceLoaderImage modules without data URIs

Bug: T198930
Change-Id: I13853a59222b38de0afde301a781af06067d4ddc
---

diff --git a/includes/resourceloader/ResourceLoaderImageModule.php b/includes/resourceloader/ResourceLoaderImageModule.php
index c7792400c4..9311f6fceb 100644
--- a/includes/resourceloader/ResourceLoaderImageModule.php
+++ b/includes/resourceloader/ResourceLoaderImageModule.php
@@ -40,6 +40,7 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 
 	protected $images = [];
 	protected $defaultColor = null;
+	protected $useDataURI = true;
 	protected $variants = [];
 	protected $prefix = null;
 	protected $selectorWithoutVariant = '.{prefix}-{name}';
@@ -183,6 +184,9 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 					$this->{$member} = $option;
 					break;
 
+				case 'useDataURI':
+					$this->{$member} = (bool)$option;
+					break;
 				case 'defaultColor':
 				case 'prefix':
 				case 'selectorWithoutVariant':
@@ -358,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,