Merge pull request #615 from magento-folks/bugs

[Folks] Bugfixes
magento · May 13, 2016 · 2f91db8 · 2f91db8
2 parents 5471bca + 727cd9d
commit 2f91db8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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()));
             }

diff --git 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();
         }