Merge pull request magento#4350 from magento-arcticfoxes/2.3-develop-pr

[arcticfoxes] Bug fixes
Hypernova-Oy · Jun 15, 2019 · 6e534ad · 6e534ad
2 parents 977753b + bae699d
commit 6e534ad
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 11 deletions.
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
@@ -67,7 +67,7 @@
     </td>
     <td class="col discount" data-th="<?= $block->escapeHtml(__('Discount Amount')) ?>">
         <?php if ($block->canShowPriceInfo($_item)) : ?>
-            <?= $block->escapeHtml($block->getOrder()->formatPrice(-$_item->getDiscountAmount())) ?>
+            <?= $block->escapeHtml($block->getOrder()->formatPrice(-$_item->getDiscountAmount()), ['span']) ?>
         <?php else : ?>
             &nbsp;
         <?php endif; ?>

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml
@@ -26,7 +26,7 @@
                        data-toggle="trigger"
                        href="#<?= $block->escapeUrl($alias) ?>"
                        id="tab-label-<?= $block->escapeHtmlAttr($alias) ?>-title">
-                        <?= $block->escapeHtml($label) ?>
+                        <?= /* @noEscape */ $label ?>
                     </a>
                 </div>
                 <div class="data item content"

diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml
@@ -13,7 +13,8 @@
     <span class="price-label"><?= $block->escapeHtml(__('Price')) ?></span>
     <span class="price-wrapper">
         <?= $block->escapeHtml(
-            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice())
+            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice()),
+            ['span']
         ) ?>
     </span>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml
@@ -13,7 +13,8 @@ $_item = $block->getItem();
 <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
     <span class="cart-price">
         <?= $block->escapeHtml(
-            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getRowTotal())
+            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getRowTotal()),
+            ['span']
         ) ?>
     </span>
 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml
@@ -13,7 +13,8 @@ $_item = $block->getItem();
 <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
     <span class="cart-price">
         <?= $block->escapeHtml(
-            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice())
+            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice()),
+            ['span']
         ) ?>
     </span>
 </span>
diff --git a/...ode/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml b/...ode/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml
@@ -11,5 +11,8 @@
 $_item = $block->getItem();
 ?>
 <span class="cart-price">
-    <?= $block->escapeHtml($this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getRowTotal())) ?>
+    <?= $block->escapeHtml(
+        $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getRowTotal()),
+        ['span']
+    ) ?>
 </span>
diff --git a/...ode/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml b/...ode/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml
@@ -12,5 +12,8 @@ $_item = $block->getItem();
 ?>
 <?php $_incl = $this->helper(Magento\Checkout\Helper\Data::class)->getSubtotalInclTax($_item); ?>
 <span class="cart-price">
-    <?= $block->escapeHtml($this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_incl)) ?>
+    <?= $block->escapeHtml(
+        $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_incl),
+        ['span']
+    ) ?>
 </span>
diff --git a/...de/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml b/...de/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml
@@ -12,6 +12,7 @@ $_item = $block->getItem();
 ?>
 <span class="cart-price">
     <?= $block->escapeHtml(
-        $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice())
+        $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice()),
+        ['span']
     ) ?>
 </span>
diff --git a/...de/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml b/...de/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml
@@ -12,5 +12,8 @@ $_item = $block->getItem();
 ?>
 <?php $_incl = $this->helper(Magento\Checkout\Helper\Data::class)->getPriceInclTax($_item); ?>
 <span class="cart-price">
-    <?= $block->escapeHtml($this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_incl)) ?>
+    <?= $block->escapeHtml(
+        $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_incl),
+        ['span']
+    ) ?>
 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
@@ -32,7 +32,8 @@
         <?php endif; ?>
             <span>
                 <?= $block->escapeHtml(
-                    $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue())
+                    $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()),
+                    ['span']
                 ) ?>
             </span>
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) :?>

diff --git a/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml b/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
@@ -30,7 +30,7 @@ $groupBehavior = $block->getGroupBehaviour() ? $block->getGroupBehaviour() : '{"
                      data-role="collapsible">
                     <a class="<?= $block->escapeHtmlAttr($groupCss) ?>-item-switch"
                        data-toggle="switch" href="#<?= $block->escapeHtmlAttr($alias) ?>">
-                        <?= $block->escapeHtml($label) ?>
+                        <?= /* @noEscape */ $label ?>
                     </a>
                 </div>
                 <div class="section-item-content <?= $block->escapeHtmlAttr($groupCss) ?>-item-content"