Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e3e68e8
prevent layout cache corruption
scottsb Nov 15, 2017
4425fa8
ENGCOM-2168: [Backport] Prevent layout cache corruption in edge case …
magento-engcom-team Jul 3, 2018
390fc2f
Reverted parameter "transport" to type DataObject
Jul 6, 2018
24cd8bc
ENGCOM-2233: [2.1-develop][BackPort] Fixed backwards incompatible cha…
magento-engcom-team Jul 9, 2018
93d9b57
Variable as a method parameter might be overridden by the loop
lfluvisotto Jul 2, 2018
d957788
ENGCOM-2224: [Backport] Updated SynonymGroup.xml #16634
magento-engcom-team Jul 9, 2018
fc15c93
ENGCOM-2235: [Backport] Variable as a method parameter might be overr…
magento-engcom-team Jul 9, 2018
4c53caf
7399-clickableOverlay-less-fix - added pointer-events rule to .modal-…
May 12, 2018
31ecfe5
improve retrieval of first elem
thomas-kl1 Jun 12, 2018
3f6105f
Removed unused class from forms less file.
chirag-wagento Jun 5, 2018
80e8164
ENGCOM-2244: [Backport] 7399-clickableOverlay-less-fix - added pointe…
magento-engcom-team Jul 10, 2018
09ae617
ENGCOM-2247: [Backport] Removed unused class from forms less file. #1…
magento-engcom-team Jul 10, 2018
a62f333
ENGCOM-2248: [Backport] Improve retrieval of first array element #16667
magento-engcom-team Jul 10, 2018
10424a6
ENGCOM-2248: [Backport] Improve retrieval of first array element #16667
Jul 10, 2018
2a3f4b0
ENGCOM-2247: [Backport] Removed unused class from forms less file. #1…
Jul 10, 2018
be23c08
ENGCOM-2244: [Backport] 7399-clickableOverlay-less-fix - added pointe…
Jul 10, 2018
4ba30a4
ENGCOM-2235: [Backport] Variable as a method parameter might be overr…
Jul 10, 2018
0be9780
ENGCOM-2233: [2.1-develop][BackPort] Fixed backwards incompatible cha…
Jul 10, 2018
d552974
ENGCOM-2224: [Backport] Updated SynonymGroup.xml #16634
Jul 10, 2018
3547278
ENGCOM-2168: [Backport] Prevent layout cache corruption in edge case …
Jul 10, 2018
6c1ca8d
Fixed code style issue
Jul 11, 2018
e72b563
:arrows_clockwise: [EngCom] Public Pull Requests - 2.1-develop
Jul 11, 2018
aa0e051
Fix proposal for https://github.com/magento/magento2/issues/12081
mattijv Feb 7, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/code/Magento/Bundle/Model/Product/Type.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
15 changes: 9 additions & 6 deletions app/code/Magento/Rule/Model/Action/AbstractAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}

Expand Down
14 changes: 7 additions & 7 deletions app/code/Magento/Rule/Model/Condition/Combine.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,13 @@ 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));
}
}

/* start aggregator methods */

/**
* @return $this
*/
Expand Down Expand Up @@ -85,9 +84,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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/Translation/etc/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
<item name="translate_wrapping" xsi:type="string"><![CDATA[~translate\=("')([^\'].*?)\'\"~]]></item>
<item name="mage_translation_widget" xsi:type="string"><![CDATA[~(?:\$|jQuery)\.mage\.__\((?s)[^'"]*?(['"])(.+?)(?<!\\)\1(?s).*?\)~]]></item>
<item name="mage_translation_static" xsi:type="string"><![CDATA[~\$t\((?s)[^'"]*?(["'])(.+?)\1(?s).*?\)~]]></item>
<item name="translate_args" xsi:type="string"><![CDATA[~translate args\=("|'|"')([^\'].*?)('"|'|")~]]></item>
</argument>
</arguments>
</type>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions lib/internal/Magento/Framework/View/Model/Layout/Merge.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 0 additions & 2 deletions lib/web/css/source/lib/_forms.less
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down