AC-2391 (#48)

Author: nathanjosiah

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento-cloud-patches",
     "description": "Provides critical fixes for Magento 2 Enterprise Edition",
     "type": "magento2-component",
-    "version": "1.0.13",
+    "version": "1.0.14",
     "license": "OSL-3.0",
     "repositories": {
         "repo.magento.com": {

patches.json

@@ -376,6 +376,9 @@
     "Raise rate limits": {
       "2.3.7-p1": "MC-43048__set_rate_limits__2.3.7-p1.patch",
       "2.4.3": "MC-43048__set_rate_limits__2.4.3.patch"
+    },
+    "Parser token fix": {
+      ">=2.3.3-p1 <=2.4.4": "MDVA-43395__parser_token_fix__2.4.3-p2.patch"
     }
   }
 }

patches/MDVA-43395__parser_token_fix__2.4.3-p2.patch

@@ -0,0 +1,33 @@
+diff -Nuar a/vendor/magento/module-email/Model/Template/Filter.php b/vendor/magento/module-email/Model/Template/Filter.php
+index 1a7c3683820a..586cb485ee1f 100644
+--- a/vendor/magento/module-email/Model/Template/Filter.php
++++ b/vendor/magento/module-email/Model/Template/Filter.php
+@@ -618,6 +618,12 @@ public function transDirective($construction)
+         }
+ 
+         $text = __($text, $params)->render();
++
++        $pattern = '/{{.*?}}/';
++        do {
++            $text = preg_replace($pattern, '', (string)$text);
++        } while (preg_match($pattern, $text));
++
+         return $this->applyModifiers($text, $modifiers);
+     }
+ 
+diff -Nuar a/vendor/magento/framework/Filter/DirectiveProcessor/VarDirective.php b/vendor/magento/framework/Filter/DirectiveProcessor/VarDirective.php
+index f2fe398c3848..78034d70ba51 100644
+--- a/vendor/magento/framework/Filter/DirectiveProcessor/VarDirective.php
++++ b/vendor/magento/framework/Filter/DirectiveProcessor/VarDirective.php
+@@ -55,6 +55,11 @@ public function process(array $construction, Template $filter, array $templateVa
+             $result = $this->filterApplier->applyFromRawParam($construction['filters'], $result);
+         }
+ 
++        $pattern = '/{{.*?}}/';
++        do {
++            $result = preg_replace($pattern, '', (string)$result);
++        } while (preg_match($pattern, $result));
++
+         return $result;
+     }
+