From e3e68e82e8438d7b358e8b239d8f03e58f1a8d37 Mon Sep 17 00:00:00 2001 From: Scott Buchanan Date: Wed, 15 Nov 2017 18:16:23 -0500 Subject: [PATCH 1/8] prevent layout cache corruption --- lib/internal/Magento/Framework/View/Model/Layout/Merge.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php index 8148b0e8c019f..738937d85a038 100644 --- a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php +++ b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php @@ -427,6 +427,9 @@ public function load($handles = []) if ($result) { $this->addUpdate($result); $this->pageLayout = $this->_loadCache($cacheIdPageLayout); + foreach ($this->getHandles() as $handle) { + $this->allHandles[$handle] = $this->handleProcessed; + } return $this; } From 390fc2f6ed3369554618d965a45985fe332b982d Mon Sep 17 00:00:00 2001 From: gwharton Date: Fri, 6 Jul 2018 15:58:02 +0100 Subject: [PATCH 2/8] Reverted parameter "transport" to type DataObject --- app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php index df674a93794c1..a919e2e457483 100644 --- a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php +++ b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php @@ -135,7 +135,7 @@ protected function prepareTemplate(Order $order) */ $this->eventManager->dispatch( 'email_order_set_template_vars_before', - ['sender' => $this, 'transport' => $transportObject->getData(), 'transportObject' => $transportObject] + ['sender' => $this, 'transport' => $transportObject, 'transportObject' => $transportObject] ); $this->templateContainer->setTemplateVars($transportObject->getData()); From 93d9b57c730604349750819c10f0d209a11eeb64 Mon Sep 17 00:00:00 2001 From: "Leandro F. L" Date: Mon, 2 Jul 2018 20:21:18 +0200 Subject: [PATCH 3/8] Variable as a method parameter might be overridden by the loop --- app/code/Magento/Bundle/Model/Product/Type.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php index affabcb7be4f3..ec6e0df0c43e4 100644 --- a/app/code/Magento/Bundle/Model/Product/Type.php +++ b/app/code/Magento/Bundle/Model/Product/Type.php @@ -497,12 +497,12 @@ public function updateQtyOption($options, \Magento\Framework\DataObject $option, foreach ($selections as $selection) { if ($selection->getProductId() == $optionProduct->getId()) { - foreach ($options as &$option) { - if ($option->getCode() == 'selection_qty_' . $selection->getSelectionId()) { + foreach ($options as $quoteItemOption) { + if ($quoteItemOption->getCode() == 'selection_qty_' . $selection->getSelectionId()) { if ($optionUpdateFlag) { - $option->setValue(intval($option->getValue())); + $quoteItemOption->setValue(intval($quoteItemOption->getValue())); } else { - $option->setValue($value); + $quoteItemOption->setValue($value); } } } From 4c53cafc638476cdb631f38919b0b795c15db627 Mon Sep 17 00:00:00 2001 From: pmakowski Date: Sat, 12 May 2018 14:14:33 +0200 Subject: [PATCH 4/8] 7399-clickableOverlay-less-fix - added pointer-events rule to .modal-popup class to let user click deeper than modals and reach to overlay's div in modal-wrapper div --- .../Magento/blank/web/css/source/components/_modals_extend.less | 2 ++ .../Magento/luma/web/css/source/components/_modals_extend.less | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less index d324bbeac598f..5974b92186cb0 100644 --- a/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less +++ b/app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less @@ -64,6 +64,8 @@ } .modal-popup { + pointer-events: none; + .modal-title { .lib-css(border-bottom, @modal-title__border); .lib-css(font-weight, @font-weight__light); diff --git a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less index b3165a41964e5..ed01ef7d027f5 100644 --- a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less +++ b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less @@ -64,6 +64,8 @@ } .modal-popup { + pointer-events: none; + .modal-title { .lib-css(border-bottom, @modal-title__border); .lib-css(font-weight, @font-weight__light); From 31ecfe5c6e66ac9011dd21e6358fe68c644e2523 Mon Sep 17 00:00:00 2001 From: Thomas Klein Date: Tue, 12 Jun 2018 11:58:57 +0200 Subject: [PATCH 5/8] improve retrieval of first elem --- .../Magento/Rule/Model/Action/AbstractAction.php | 15 +++++++++------ app/code/Magento/Rule/Model/Condition/Combine.php | 13 ++++++------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/code/Magento/Rule/Model/Action/AbstractAction.php b/app/code/Magento/Rule/Model/Action/AbstractAction.php index 6573b5a7a963e..34c1b411244ee 100644 --- a/app/code/Magento/Rule/Model/Action/AbstractAction.php +++ b/app/code/Magento/Rule/Model/Action/AbstractAction.php @@ -46,13 +46,16 @@ public function __construct( $this->loadAttributeOptions()->loadOperatorOptions()->loadValueOptions(); - foreach (array_keys($this->getAttributeOption()) as $attr) { - $this->setAttribute($attr); - break; + $attributes = $this->getAttributeOption(); + if ($attributes) { + reset($attributes); + $this->setAttribute(key($attributes)); } - foreach (array_keys($this->getOperatorOption()) as $operator) { - $this->setOperator($operator); - break; + + $operators = $this->getOperatorOption(); + if ($operators) { + reset($operators); + $this->setOperator(key($operators)); } } diff --git a/app/code/Magento/Rule/Model/Condition/Combine.php b/app/code/Magento/Rule/Model/Condition/Combine.php index 63c96cca1aeac..e554c6d15f145 100644 --- a/app/code/Magento/Rule/Model/Condition/Combine.php +++ b/app/code/Magento/Rule/Model/Condition/Combine.php @@ -42,10 +42,8 @@ public function __construct(Context $context, array $data = []) $this->loadAggregatorOptions(); $options = $this->getAggregatorOptions(); if ($options) { - foreach (array_keys($options) as $aggregator) { - $this->setAggregator($aggregator); - break; - } + reset($options); + $this->setAggregator(key($options)); } } @@ -85,9 +83,10 @@ public function getAggregatorName() public function getAggregatorElement() { if ($this->getAggregator() === null) { - foreach (array_keys($this->getAggregatorOption()) as $key) { - $this->setAggregator($key); - break; + $options = $this->getAggregatorOption(); + if ($options) { + reset($options); + $this->setAggregator(key($options)); } } return $this->getForm()->addField( From 3f6105f8ca3ec52bf8fa7f5567a75eb460a71a37 Mon Sep 17 00:00:00 2001 From: Chirag Matholiya Date: Tue, 5 Jun 2018 10:22:38 +0530 Subject: [PATCH 6/8] Removed unused class from forms less file. --- lib/web/css/source/lib/_forms.less | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/web/css/source/lib/_forms.less b/lib/web/css/source/lib/_forms.less index 800054e58c3dd..b1c7a49da4a7a 100644 --- a/lib/web/css/source/lib/_forms.less +++ b/lib/web/css/source/lib/_forms.less @@ -465,11 +465,9 @@ .lib-css(margin, @_margin); .lib-css(padding, @_padding); letter-spacing: -.31em; - //word-spacing: -.43em; > * { letter-spacing: normal; - //word-spacing: normal; } > .legend { From 6c1ca8d772af373b5a3b79f371410869456c4fc1 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Wed, 11 Jul 2018 07:59:28 +0300 Subject: [PATCH 7/8] Fixed code style issue --- app/code/Magento/Rule/Model/Condition/Combine.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Rule/Model/Condition/Combine.php b/app/code/Magento/Rule/Model/Condition/Combine.php index e554c6d15f145..65460ab445795 100644 --- a/app/code/Magento/Rule/Model/Condition/Combine.php +++ b/app/code/Magento/Rule/Model/Condition/Combine.php @@ -48,6 +48,7 @@ public function __construct(Context $context, array $data = []) } /* start aggregator methods */ + /** * @return $this */ From aa0e0514b167b3e9bd0c8c8ce15b4dcf348b08c9 Mon Sep 17 00:00:00 2001 From: Matti Vapa Date: Wed, 7 Feb 2018 10:31:49 +0200 Subject: [PATCH 8/8] Fix proposal for https://github.com/magento/magento2/issues/12081 --- app/code/Magento/Translation/etc/di.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Translation/etc/di.xml b/app/code/Magento/Translation/etc/di.xml index c75324029116b..f719991cb9128 100644 --- a/app/code/Magento/Translation/etc/di.xml +++ b/app/code/Magento/Translation/etc/di.xml @@ -61,6 +61,7 @@ +