Merge pull request #145 from magento-commerce/MCLOUD-13753

MCLOUD-13753 : Improve-admin-cache-efficiency

Author: ashvini22326

patches.json

@@ -304,6 +304,9 @@
     },
     "Patch for CVE-2025-47109 - Improve-category-view": {
       "2.4.8": "MCLOUD-13752__Patch_for_CVE-2025-47109_Improve_category_view__2.4.8.patch"
+    },
+    "Patch for CVE-2025-47110 - Improve-admin-cache-efficiency": {
+      ">=2.4.4 <2.4.4-p14 || >=2.4.5 <2.4.5-p13 || >=2.4.6 <2.4.6-p11 || >=2.4.7 <2.4.7-p6 || 2.4.8": "MCLOUD-13753__Patch_for_CVE-2025-47110_improve-admin-cache-efficiency__2.4.x.patch"
     }
   },
   "magento/module-paypal": {

patches/MCLOUD-13753__Patch_for_CVE-2025-47110_improve-admin-cache-efficiency__2.4.x.patch

@@ -0,0 +1,25 @@
+diff --git a/vendor/magento/module-email/Model/Template/Filter.php b/vendor/magento/module-email/Model/Template/Filter.php
+index f5b69484285cc..f86deacad3b4e 100644
+--- a/vendor/magento/module-email/Model/Template/Filter.php
++++ b/vendor/magento/module-email/Model/Template/Filter.php
+@@ -1,7 +1,7 @@
+ <?php
+ /**
+- * Copyright © Magento, Inc. All rights reserved.
+- * See COPYING.txt for license details.
++ * Copyright 2011 Adobe
++ * All Rights Reserved.
+  */
+ declare(strict_types=1);
+ 
+@@ -432,6 +432,10 @@ public function blockDirective($construction)
+             $block->setDataUsingMethod($k, $v);
+         }
+ 
++        if (!$block->hasData('cache_key')) {
++            $block->setDataUsingMethod('cache_key', $block->getCacheKey());
++        }
++
+         if (isset($blockParameters['output'])) {
+             $method = $blockParameters['output'];
+         }