From 5130a5e48788e6cfb5c42d4eef707af0e3af30f7 Mon Sep 17 00:00:00 2001 From: Iryna Lagno Date: Fri, 13 May 2016 10:49:15 +0300 Subject: [PATCH 1/2] MAGETWO-32380: Customer is logged out after clicking two links in mini shopping cart menu --- lib/internal/Magento/Framework/Session/SessionManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/Session/SessionManager.php b/lib/internal/Magento/Framework/Session/SessionManager.php index aad3fc9fb34e8..e8013b024f438 100644 --- a/lib/internal/Magento/Framework/Session/SessionManager.php +++ b/lib/internal/Magento/Framework/Session/SessionManager.php @@ -470,7 +470,7 @@ public function regenerateId() return $this; } if ($this->isSessionExists()) { - session_regenerate_id(true); + session_regenerate_id(false); } else { session_start(); } From 479fa5a90eae4ca3539c1c855e8cefddb4b652d7 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Fri, 13 May 2016 13:26:43 +0300 Subject: [PATCH 2/2] MAGETWO-52747: Fatal error on reordering on Storefront --- .../Magento/Sales/Model/ResourceModel/Order/Item/Collection.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php index 88725250d4fb5..9fa5c8ae13e28 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php @@ -55,6 +55,7 @@ protected function _afterLoad() * Assign parent items */ foreach ($this as $item) { + $this->_resource->unserializeFields($item); if ($item->getParentItemId()) { $item->setParentItem($this->getItemById($item->getParentItemId())); }