Fix deferred images in HTML emails

contao · Aug 30, 2019 · 7e750d8 · 7e750d8
1 parent 558582e
commit 7e750d8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/core-bundle/src/Resources/contao/library/Contao/Email.php b/core-bundle/src/Resources/contao/library/Contao/Email.php
@@ -407,7 +407,7 @@ public function sendTo()
 						$src = rawurldecode($src); // see #3713
 
 						// Embed the image if the URL is now relative
-						if (!preg_match('@^https?://@', $src) && file_exists($this->strImageDir . $src))
+						if (!preg_match('@^https?://@', $src) && ($objFile = new File(StringUtil::stripRootDir($this->strImageDir . $src))) && ($objFile->exists() || $objFile->generateIfDeferredImage()))
 						{
 							if (!isset($arrCid[$src]))
 							{

diff --git a/core-bundle/src/Resources/contao/library/Contao/File.php b/core-bundle/src/Resources/contao/library/Contao/File.php
@@ -599,11 +599,11 @@ public function getModel()
 	}
 
 	/**
-	 * Return the file content as string
+	 * Generate the image if the current file is a deferred image and does not exist yet
 	 *
-	 * @return string The file content without BOM
+	 * @return bool True if a deferred image was resized otherwise false
 	 */
-	public function getContent()
+	public function generateIfDeferredImage()
 	{
 		if (!$this->exists())
 		{
@@ -614,6 +614,8 @@ public function getContent()
 				if ($image instanceof DeferredImageInterface)
 				{
 					System::getContainer()->get('contao.image.resizer')->resizeDeferredImage($image);
+
+					return true;
 				}
 			}
 			catch (\Throwable $e)
@@ -622,6 +624,18 @@ public function getContent()
 			}
 		}
 
+		return false;
+	}
+
+	/**
+	 * Return the file content as string
+	 *
+	 * @return string The file content without BOM
+	 */
+	public function getContent()
+	{
+		$this->generateIfDeferredImage();
+
 		$strContent = file_get_contents($this->strRootDir . '/' . ($this->strTmp ?: $this->strFile));
 
 		// Remove BOMs (see #4469)