Skip to content

Commit eb4e0c9

Browse files
committed
Merge remote-tracking branch 'mainline/develop' into BUGS
2 parents 6687d03 + 2f91db8 commit eb4e0c9

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ protected function _afterLoad()
5555
* Assign parent items
5656
*/
5757
foreach ($this as $item) {
58+
$this->_resource->unserializeFields($item);
5859
if ($item->getParentItemId()) {
5960
$item->setParentItem($this->getItemById($item->getParentItemId()));
6061
}

lib/internal/Magento/Framework/Session/SessionManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ public function regenerateId()
470470
return $this;
471471
}
472472
if ($this->isSessionExists()) {
473-
session_regenerate_id(true);
473+
session_regenerate_id(false);
474474
} else {
475475
session_start();
476476
}

0 commit comments

Comments
 (0)