Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit d14510f

Browse files
authored
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - magento/magento2#19113: [2.2 backport] fix cipherMethod detection for openssl 1.1.1 (by @BlackIkeEagle) - magento/magento2#17889: Fixed child items showing on My Account order view (by @rogyar) Fixed GitHub Issues: - magento/magento2#16434: Bundle Product Options not showing in Customer Account - Items Ordered (reported by @robertkent) has been fixed in magento/magento2#17889 by @rogyar in 2.2-develop branch Related commits: 1. f744606
2 parents 7775f7d + 064d879 commit d14510f

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

app/code/Magento/Analytics/Model/Cryptographer.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,12 @@ private function getInitializationVector()
124124
*/
125125
private function validateCipherMethod($cipherMethod)
126126
{
127-
$methods = openssl_get_cipher_methods();
127+
$methods = array_map(
128+
'strtolower',
129+
openssl_get_cipher_methods()
130+
);
131+
$cipherMethod = strtolower($cipherMethod);
132+
128133
return (false !== array_search($cipherMethod, $methods));
129134
}
130135
}

app/code/Magento/Sales/Block/Order/Items.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ protected function _prepareLayout()
7171

7272
$this->itemCollection = $this->itemCollectionFactory->create();
7373
$this->itemCollection->setOrderFilter($this->getOrder());
74-
$this->itemCollection->filterByParent(null);
7574

7675
/** @var \Magento\Theme\Block\Html\Pager $pagerBlock */
7776
$pagerBlock = $this->getChildBlock('sales_order_item_pager');

0 commit comments

Comments
 (0)