ENGCOM-2168: [Backport] Prevent layout cache corruption in edge case #16493

magento-engcom-team · magento-engcom-team · commit 4425fa86899c · 2018-07-03T03:24:19.000-05:00
- Merge Pull Request #16493 from gelanivishal/magento2:2.1-develop-PR-port-12314 - Merged commits: 1. e3e68e8
diff --git a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
@@ -427,6 +427,9 @@ public function load($handles = [])
         if ($result) {
             $this->addUpdate($result);
             $this->pageLayout = $this->_loadCache($cacheIdPageLayout);
+            foreach ($this->getHandles() as $handle) {
+                $this->allHandles[$handle] = $this->handleProcessed;
+            }
             return $this;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -427,6 +427,9 @@ public function load($handles = [])`
`427`	`427`	`if ($result) {`
`428`	`428`	`$this->addUpdate($result);`
`429`	`429`	`$this->pageLayout = $this->_loadCache($cacheIdPageLayout);`
	`430`	`+ foreach ($this->getHandles() as $handle) {`
	`431`	`+ $this->allHandles[$handle] = $this->handleProcessed;`
	`432`	`+ }`
`430`	`433`	`return $this;`
`431`	`434`	`}`
`432`	`435`