Skip to content

Commit 0c481a1

Browse files
MAGETWO-87155: [EngCom Team] Batch 16. Forwardports to 2.3-develop #1302
2 parents 0379ead + 16c8366 commit 0c481a1

File tree

10 files changed

+18
-39
lines changed

10 files changed

+18
-39
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
66

77
## Magento system requirements
8-
[Magento system requirements](http://devdocs.magento.com/magento-system-requirements.html)
8+
[Magento system requirements](http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements2.html)
99

1010
## Install Magento
1111
To install Magento, see either:
1212

1313
* [Magento DevBox](https://magento.com/tech-resources/download), the easiest way to get started with Magento.
14-
* [Installation guide](http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html)
14+
* [Installation guide](http://devdocs.magento.com/guides/v2.2/install-gde/bk-install-guide.html)
1515

1616
<h2>Contributing to the Magento 2 code base</h2>
1717
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
@@ -22,8 +22,8 @@ To learn about issues, click [here][2]. To open an issue, click [here][3].
2222

2323
To suggest documentation improvements, click [here][4].
2424

25-
[1]: <http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html>
26-
[2]: <http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#report>
25+
[1]: <http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html>
26+
[2]: <http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#report>
2727
[3]: <https://github.com/magento/magento2/issues>
2828
[4]: <http://devdocs.magento.com>
2929

app/code/Magento/Backup/Model/Db.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backu
154154

155155
if ($tableStatus->getDataLength() > self::BUFFER_LENGTH) {
156156
if ($tableStatus->getAvgRowLength() < self::BUFFER_LENGTH) {
157-
$limit = floor(self::BUFFER_LENGTH / $tableStatus->getAvgRowLength());
157+
$limit = floor(self::BUFFER_LENGTH / max($tableStatus->getAvgRowLength(), 1));
158158
$multiRowsLength = ceil($tableStatus->getRows() / $limit);
159159
} else {
160160
$limit = 1;

app/code/Magento/Catalog/Helper/Product/View.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,18 +120,18 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu
120120
// Load default page handles and page configurations
121121
if ($params && $params->getBeforeHandles()) {
122122
foreach ($params->getBeforeHandles() as $handle) {
123-
$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
124123
$resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], $handle, false);
124+
$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
125125
}
126126
}
127-
128-
$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
127+
129128
$resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);
129+
$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
130130

131131
if ($params && $params->getAfterHandles()) {
132132
foreach ($params->getAfterHandles() as $handle) {
133-
$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
134133
$resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], $handle, false);
134+
$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
135135
}
136136
}
137137

app/code/Magento/Checkout/view/frontend/web/js/view/configure/product-customer-data.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
require([
22
'jquery',
3-
'Magento_Customer/js/customer-data'
3+
'Magento_Customer/js/customer-data',
4+
'domReady!'
45
], function ($, customerData) {
56
'use strict';
67

app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="billing-address-details" data-bind="if: isAddressDetailsVisible() && currentBillingAddress()">
88
<!-- ko text: currentBillingAddress().prefix --><!-- /ko --> <!-- ko text: currentBillingAddress().firstname --><!-- /ko --> <!-- ko text: currentBillingAddress().middlename --><!-- /ko -->
99
<!-- ko text: currentBillingAddress().lastname --><!-- /ko --> <!-- ko text: currentBillingAddress().suffix --><!-- /ko --><br/>
10-
<!-- ko text: currentBillingAddress().street --><!-- /ko --><br/>
10+
<!-- ko text: _.values(currentBillingAddress().street).join(", ") --><!-- /ko --><br/>
1111
<!-- ko text: currentBillingAddress().city --><!-- /ko -->, <span data-bind="html: currentBillingAddress().region"></span> <!-- ko text: currentBillingAddress().postcode --><!-- /ko --><br/>
1212
<!-- ko text: getCountryName(currentBillingAddress().countryId) --><!-- /ko --><br/>
1313
<!-- ko if: (currentBillingAddress().telephone) -->

app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!-- ko if: (visible()) -->
88
<!-- ko text: address().prefix --><!-- /ko --> <!-- ko text: address().firstname --><!-- /ko --> <!-- ko text: address().middlename --><!-- /ko -->
99
<!-- ko text: address().lastname --><!-- /ko --> <!-- ko text: address().suffix --><!-- /ko --><br/>
10-
<!-- ko text: address().street --><!-- /ko --><br/>
10+
<!-- ko text: _.values(address().street).join(", ") --><!-- /ko --><br/>
1111
<!-- ko text: address().city --><!-- /ko -->, <span data-bind="html: address().region"></span> <!-- ko text: address().postcode --><!-- /ko --><br/>
1212
<!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/>
1313
<!-- ko if: (address().telephone) -->

app/code/Magento/ProductAlert/Controller/Add/TestObserver.php

Lines changed: 0 additions & 23 deletions
This file was deleted.

app/code/Magento/Review/Controller/Product/ListAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ protected function getProductPage($product)
2626
$resultPage->getConfig()->setPageLayout($product->getPageLayout());
2727
}
2828
$urlSafeSku = rawurlencode($product->getSku());
29-
$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
3029
$resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);
30+
$resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
3131
$resultPage->addUpdate($product->getCustomLayoutUpdate());
3232
return $resultPage;
3333
}

app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ public function getJsonConfig()
8484
* Parse swatch labels for template
8585
*
8686
* @codeCoverageIgnore
87-
* @param null $swatchStoreValue
88-
* @return string
87+
* @param null|array $swatchStoreValue
88+
* @return null|array
8989
*/
9090
protected function reformatSwatchLabels($swatchStoreValue = null)
9191
{
9292
if ($swatchStoreValue === null) {
9393
return;
9494
}
95-
$newSwatch = '';
95+
$newSwatch = [];
9696
foreach ($swatchStoreValue as $key => $value) {
9797
if ($value[0] == '#') {
9898
$newSwatch[$key] = 'background: '.$value;

app/design/frontend/Magento/luma/Magento_Newsletter/web/css/source/_module.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
border-bottom-left-radius: 0;
6868
border-top-left-radius: 0;
6969
margin-left: -1px;
70+
white-space: nowrap;
7071
}
7172
}
7273
}

0 commit comments

Comments
 (0)