diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/MergeTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/MergeTest.php index d18e38f6ad2a0..115b262216066 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/MergeTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/MergeTest.php @@ -272,7 +272,16 @@ public function testLoadCache() $handles = ['fixture_handle_one', 'fixture_handle_two']; $this->_model->load($handles); $this->assertEquals($handles, $this->_model->getHandles()); - $this->assertEquals(self::FIXTURE_LAYOUT_XML, $this->_model->asString()); + $expectedResult = << + + + + + + +XML; + $this->assertEquals($expectedResult, $this->_model->asString()); } public function testLoadDbApp() diff --git a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php index 68e410a253f0d..79c4ba624e778 100644 --- a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php +++ b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php @@ -424,9 +424,10 @@ public function load($handles = []) $cacheId = $this->getCacheId(); $cacheIdPageLayout = $cacheId . '_' . self::PAGE_LAYOUT_CACHE_SUFFIX; $result = $this->_loadCache($cacheId); - if ($result) { + $pageLayoutResult = $this->_loadCache($cacheIdPageLayout); + if ($result && $pageLayoutResult) { $this->addUpdate($result); - $this->pageLayout = $this->_loadCache($cacheIdPageLayout); + $this->pageLayout = $pageLayoutResult; foreach ($this->getHandles() as $handle) { $this->allHandles[$handle] = $this->handleProcessed; }