ENGCOM-2164: [Forwardport] Prevent layout cache corruption in edge case

#16487
magento · Jul 12, 2018 · 9e2e451 · 9e2e451
2 parents d0eca97 + f6b2fd6
commit 9e2e451
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
@@ -443,6 +443,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;
         }