Skip to content

Commit 5a6a000

Browse files
Fix PageCache: async rendering of blocks can corrupt layout cache #8554
1 parent 3bdfa1b commit 5a6a000

File tree

1 file changed

+3
-1
lines changed
  • app/code/Magento/PageCache/Controller

1 file changed

+3
-1
lines changed

app/code/Magento/PageCache/Controller/Block.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ protected function _getBlocks()
6868
$blocks = $this->jsonSerializer->unserialize($blocks);
6969
$handles = $this->base64jsonSerializer->unserialize($handles);
7070

71-
$handles[] = $this->additionalPageCacheHandle;
71+
if(is_array($handles)){
72+
$handles[] = $this->additionalPageCacheHandle;
73+
}
7274

7375
$this->_view->loadLayout($handles, true, true, false);
7476
$data = [];

0 commit comments

Comments
 (0)