Skip to content

Commit 88ca5f7

Browse files
cparticacpartica
committed
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-89292-SDL
2 parents c00ad81 + 286b00f commit 88ca5f7

File tree

12 files changed

+127
-25
lines changed

12 files changed

+127
-25
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ private function preparePageMetadata(ResultPage $resultPage, $product)
131131
if ($description) {
132132
$pageConfig->setDescription($description);
133133
} else {
134-
$pageConfig->setDescription($this->string->substr($product->getDescription(), 0, 255));
134+
$pageConfig->setDescription($this->string->substr(strip_tags($product->getDescription()), 0, 255));
135135
}
136136

137137
if ($this->_catalogProduct->canUseCanonicalTag()) {

‎app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,21 +145,21 @@
145145
<!-- sort order for this totals is configured on admin panel-->
146146
<!-- Stores->Configuration->SALES->Sales->General->Checkout Totals Sort Order -->
147147
<item name="subtotal" xsi:type="array">
148-
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/subtotal</item>
148+
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/subtotal</item>
149149
<item name="config" xsi:type="array">
150150
<item name="title" xsi:type="string" translate="true">Subtotal</item>
151151
<item name="template" xsi:type="string">Magento_Checkout/cart/totals/subtotal</item>
152152
</item>
153153
</item>
154154
<item name="shipping" xsi:type="array">
155-
<item name="component" xsi:type="string">Magento_Checkout/js/view/cart/totals/shipping</item>
155+
<item name="component" xsi:type="string">Magento_Checkout/js/view/cart/totals/shipping</item>
156156
<item name="config" xsi:type="array">
157157
<item name="title" xsi:type="string" translate="true">Shipping</item>
158158
<item name="template" xsi:type="string">Magento_Checkout/cart/totals/shipping</item>
159159
</item>
160160
</item>
161161
<item name="grand-total" xsi:type="array">
162-
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/grand-total</item>
162+
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/grand-total</item>
163163
<item name="config" xsi:type="array">
164164
<item name="title" xsi:type="string" translate="true">Order Total</item>
165165
<item name="template" xsi:type="string">Magento_Checkout/cart/totals/grand-total</item>

‎app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,20 +364,20 @@
364364
<!-- sort order for this totals is configured on admin panel-->
365365
<!-- Stores->Configuration->SALES->Sales->General->Checkout Totals Sort Order -->
366366
<item name="subtotal" xsi:type="array">
367-
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/subtotal</item>
367+
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/subtotal</item>
368368
<item name="config" xsi:type="array">
369369
<item name="title" xsi:type="string" translate="true">Cart Subtotal</item>
370370
</item>
371371
</item>
372372
<item name="shipping" xsi:type="array">
373-
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/shipping</item>
373+
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/shipping</item>
374374
<item name="config" xsi:type="array">
375375
<item name="title" xsi:type="string" translate="true">Shipping</item>
376376
<item name="notCalculatedMessage" xsi:type="string" translate="true">Not yet calculated</item>
377377
</item>
378378
</item>
379379
<item name="grand-total" xsi:type="array">
380-
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/grand-total</item>
380+
<item name="component" xsi:type="string">Magento_Checkout/js/view/summary/grand-total</item>
381381
<item name="config" xsi:type="array">
382382
<item name="title" xsi:type="string" translate="true">Order Total</item>
383383
</item>

‎app/code/Magento/GoogleAnalytics/etc/adminhtml/system.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@
2323
<field id="*/*/active">1</field>
2424
</depends>
2525
</field>
26-
27-
<field id="anonymize" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
26+
<field id="anonymize" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
2827
<label>Anonymize IP</label>
2928
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
30-
<depends>
29+
<depends>
3130
<field id="*/*/active">1</field>
3231
</depends>
3332
</field>

‎app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
10-
<referenceContainer name="after.body.start">
10+
<referenceContainer name="head.additional">
1111
<block class="Magento\GoogleAnalytics\Block\Ga" name="google_analytics" as="google_analytics" template="Magento_GoogleAnalytics::ga.phtml"/>
1212
</referenceContainer>
1313
</body>

‎app/code/Magento/SalesRule/view/frontend/layout/checkout_cart_index.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<item name="before_grandtotal" xsi:type="array">
1717
<item name="children" xsi:type="array">
1818
<item name="discount" xsi:type="array">
19-
<item name="component" xsi:type="string">Magento_SalesRule/js/view/cart/totals/discount</item>
19+
<item name="component" xsi:type="string">Magento_SalesRule/js/view/cart/totals/discount</item>
2020
<item name="config" xsi:type="array">
2121
<item name="title" xsi:type="string" translate="true">Discount</item>
2222
</item>

‎app/code/Magento/SalesRule/view/frontend/layout/checkout_index_index.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<item name="totals" xsi:type="array">
4848
<item name="children" xsi:type="array">
4949
<item name="discount" xsi:type="array">
50-
<item name="component" xsi:type="string">Magento_SalesRule/js/view/summary/discount</item>
50+
<item name="component" xsi:type="string">Magento_SalesRule/js/view/summary/discount</item>
5151
<item name="config" xsi:type="array">
5252
<item name="title" xsi:type="string" translate="true">Discount</item>
5353
</item>

‎app/code/Magento/Tax/view/frontend/layout/checkout_cart_index.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434
<item name="block-totals" xsi:type="array">
3535
<item name="children" xsi:type="array">
3636
<item name="subtotal" xsi:type="array">
37-
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/subtotal</item>
37+
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/subtotal</item>
3838
<item name="config" xsi:type="array">
3939
<item name="template" xsi:type="string">Magento_Tax/checkout/summary/subtotal</item>
4040
<item name="excludingTaxMessage" xsi:type="string" translate="true">(Excl. Tax)</item>
4141
<item name="includingTaxMessage" xsi:type="string" translate="true">(Incl. Tax)</item>
4242
</item>
4343
</item>
4444
<item name="shipping" xsi:type="array">
45-
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/cart/totals/shipping</item>
45+
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/cart/totals/shipping</item>
4646
<item name="sortOrder" xsi:type="string">20</item>
4747
<item name="config" xsi:type="array">
4848
<item name="template" xsi:type="string">Magento_Tax/checkout/cart/totals/shipping</item>
@@ -51,21 +51,21 @@
5151
</item>
5252
</item>
5353
<item name="before_grandtotal" xsi:type="array">
54-
<item name="component" xsi:type="string">uiComponent</item>
54+
<item name="component" xsi:type="string">uiComponent</item>
5555
<item name="sortOrder" xsi:type="string">30</item>
5656
<item name="children" xsi:type="array">
5757
<!-- merge your components here -->
5858
</item>
5959
</item>
6060
<item name="tax" xsi:type="array">
61-
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/cart/totals/tax</item>
61+
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/cart/totals/tax</item>
6262
<item name="config" xsi:type="array">
6363
<item name="template" xsi:type="string">Magento_Tax/checkout/cart/totals/tax</item>
6464
<item name="title" xsi:type="string" translate="true">Tax</item>
6565
</item>
6666
</item>
6767
<item name="grand-total" xsi:type="array">
68-
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/cart/totals/grand-total</item>
68+
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/cart/totals/grand-total</item>
6969
<item name="config" xsi:type="array">
7070
<item name="template" xsi:type="string">Magento_Tax/checkout/cart/totals/grand-total</item>
7171
<item name="exclTaxLabel" xsi:type="string" translate="true">Order Total Excl. Tax</item>

‎app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,35 +38,35 @@
3838
<!-- sort order for this totals is configured on admin panel-->
3939
<!-- Stores->Configuration->SALES->Sales->General->Checkout Totals Sort Order -->
4040
<item name="subtotal" xsi:type="array">
41-
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/subtotal</item>
41+
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/subtotal</item>
4242
<item name="config" xsi:type="array">
4343
<item name="excludingTaxMessage" xsi:type="string" translate="true">Excl. Tax</item>
4444
<item name="includingTaxMessage" xsi:type="string" translate="true">Incl. Tax</item>
4545
</item>
4646
</item>
4747
<item name="shipping" xsi:type="array">
48-
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/shipping</item>
48+
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/shipping</item>
4949
<item name="sortOrder" xsi:type="string">20</item>
5050
<item name="config" xsi:type="array">
5151
<item name="excludingTaxMessage" xsi:type="string" translate="true">Excl. Tax</item>
5252
<item name="includingTaxMessage" xsi:type="string" translate="true">Incl. Tax</item>
5353
</item>
5454
</item>
5555
<item name="before_grandtotal" xsi:type="array">
56-
<item name="component" xsi:type="string">uiComponent</item>
56+
<item name="component" xsi:type="string">uiComponent</item>
5757
<item name="sortOrder" xsi:type="string">30</item>
5858
<item name="children" xsi:type="array">
5959
<!-- merge your components here -->
6060
</item>
6161
</item>
6262
<item name="tax" xsi:type="array">
63-
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/tax</item>
63+
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/tax</item>
6464
<item name="config" xsi:type="array">
6565
<item name="title" xsi:type="string" translate="true">Tax</item>
6666
</item>
6767
</item>
6868
<item name="grand-total" xsi:type="array">
69-
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/grand-total</item>
69+
<item name="component" xsi:type="string">Magento_Tax/js/view/checkout/summary/grand-total</item>
7070
<item name="config" xsi:type="array">
7171
<item name="exclTaxLabel" xsi:type="string" translate="true">Order Total Excl. Tax</item>
7272
<item name="inclTaxLabel" xsi:type="string" translate="true">Order Total Incl. Tax</item>

‎app/code/Magento/Weee/view/frontend/layout/checkout_index_index.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
<item name="subtotal" xsi:type="array">
3636
<item name="children" xsi:type="array">
3737
<item name="weee_row_incl_tax" xsi:type="array">
38-
<item name="component" xsi:type="string">Magento_Weee/js/view/checkout/summary/item/price/row_incl_tax</item>
38+
<item name="component" xsi:type="string">Magento_Weee/js/view/checkout/summary/item/price/row_incl_tax</item>
3939
<item name="displayArea" xsi:type="string">row_incl_tax</item>
4040
</item>
4141
<item name="weee_row_excl_tax" xsi:type="array">
42-
<item name="component" xsi:type="string">Magento_Weee/js/view/checkout/summary/item/price/row_excl_tax</item>
42+
<item name="component" xsi:type="string">Magento_Weee/js/view/checkout/summary/item/price/row_excl_tax</item>
4343
<item name="displayArea" xsi:type="string">row_excl_tax</item>
4444
</item>
4545
</item>

0 commit comments

Comments
 (0)