Fix PageCache: async rendering of blocks can corrupt layout cache #8554

magento · May 9, 2017 · 5a6a000 · 5a6a000
1 parent 3bdfa1b
commit 5a6a000
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/code/Magento/PageCache/Controller/Block.php b/app/code/Magento/PageCache/Controller/Block.php
@@ -68,7 +68,9 @@ protected function _getBlocks()
         $blocks = $this->jsonSerializer->unserialize($blocks);
         $handles = $this->base64jsonSerializer->unserialize($handles);
 
-        $handles[] = $this->additionalPageCacheHandle;
+        if(is_array($handles)){
+            $handles[] = $this->additionalPageCacheHandle;
+        }
 
         $this->_view->loadLayout($handles, true, true, false);
         $data = [];