AC-2391: Remove legacy variable resolver from email template processor

xmav · xmav · commit 54c32494b0ee · 2022-02-24T18:39:32.000-06:00
- remove plugin to avoid performance degradations
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -453,6 +453,8 @@ protected function addEmailVariables($variables, $storeId)
         if (!isset($variables['store'])) {
             $variables['store'] = $store;
         }
+        $storeAddress = $variables['store']->getFormattedAddress();
+        $variables['store']->setData('formatted_address', $storeAddress);
         if (!isset($variables['store']['frontend_name'])) {
             $variables['store']['frontend_name'] = $store->getFrontendName();
         }
diff --git a/app/code/Magento/Email/Model/Plugin/StoreAddress.php b/app/code/Magento/Email/Model/Plugin/StoreAddress.php
diff --git a/app/code/Magento/Email/etc/di.xml b/app/code/Magento/Email/etc/di.xml
@@ -93,7 +93,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Store\Model\Store">
-        <plugin name="EmailTemplateStoreAddress" type="Magento\Email\Model\Plugin\StoreAddress"/>
-    </type>
 </config>

Original file line number	Diff line number	Diff line change
`@@ -453,6 +453,8 @@ protected function addEmailVariables($variables, $storeId)`
`453`	`453`	`if (!isset($variables['store'])) {`
`454`	`454`	`$variables['store'] = $store;`
`455`	`455`	`}`
	`456`	`+ $storeAddress = $variables['store']->getFormattedAddress();`
	`457`	`+ $variables['store']->setData('formatted_address', $storeAddress);`
`456`	`458`	`if (!isset($variables['store']['frontend_name'])) {`
`457`	`459`	`$variables['store']['frontend_name'] = $store->getFrontendName();`
`458`	`460`	`}`