From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 19 Nov 2020 13:30:56 +0000 (+0100)
Subject: Adjust RecipientAwareTextMimePart for Emogrifier 4.0
X-Git-Tag: 5.4.0_Alpha_1~593^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ff5dcdabc442a7db6daf04a71499229e7aeedf00;p=GitHub%2FWoltLab%2FWCF.git

Adjust RecipientAwareTextMimePart for Emogrifier 4.0
---

diff --git a/wcfsetup/install/files/lib/system/email/mime/RecipientAwareTextMimePart.class.php b/wcfsetup/install/files/lib/system/email/mime/RecipientAwareTextMimePart.class.php
index 5b1ea91e72..f8263ee8a2 100644
--- a/wcfsetup/install/files/lib/system/email/mime/RecipientAwareTextMimePart.class.php
+++ b/wcfsetup/install/files/lib/system/email/mime/RecipientAwareTextMimePart.class.php
@@ -1,6 +1,6 @@
 <?php
 namespace wcf\system\email\mime;
-use Pelago\Emogrifier;
+use Pelago\Emogrifier\CssInliner;
 use wcf\data\style\ActiveStyle;
 use wcf\system\cache\builder\StyleCacheBuilder;
 use wcf\system\email\Mailbox;
@@ -73,12 +73,9 @@ class RecipientAwareTextMimePart extends TextMimePart implements IRecipientAware
 			$result = EmailTemplateEngine::getInstance()->fetch($this->template, $this->application, $this->getTemplateVariables(), true);
 			
 			if ($this->mimeType === 'text/html') {
-				$emogrifier = new Emogrifier();
-				$emogrifier->disableInvisibleNodeRemoval();
-				
-				$emogrifier->setHtml($result);
-				
-				$result = $emogrifier->emogrify();
+				$result = CssInliner::fromHtml($result)
+					->inlineCss()
+					->render();
 			}
 			else if ($this->mimeType === 'text/plain') {
 				$result = preg_replace('~\[URL:(https?://[^\]\s]*)\]~', '<\\1>', $result);