Skip to content

Commit 837b6fc

Browse files
committed
MAGETWO-99300 - Eliminate @escapeNotVerified in Magento_Multishipping module
* Fixed broken HTML on checkout shipping page
1 parent a5047f6 commit 837b6fc

File tree

1 file changed

+13
-10
lines changed
  • app/code/Magento/Multishipping/view/frontend/templates/checkout

1 file changed

+13
-10
lines changed

app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,22 @@
5858
<input type="radio" name="shipping_method[<?= (int) $_address->getId() ?>]" value="<?= $block->escapeHtmlAttr($_rate->getCode()) ?>" id="s_method_<?= (int) $_address->getId() ?>_<?= $block->escapeHtmlAttr($_rate->getCode()) ?>" <?= ($_rate->getCode()===$block->getAddressShippingMethod($_address)) ? ' checked="checked"' : '' ?> class="radio" />
5959
<?php endif; ?>
6060
</div>
61-
<label for="s_method_<?= (int) $_address->getId() ?>_<?= $block->escapeHtmlAttr($_rate->getCode()) ?>"><?= $block->escapeHtml($_rate->getMethodTitle()) ?>
61+
<label for="s_method_<?= (int) $_address->getId() ?>_<?= $block->escapeHtmlAttr($_rate->getCode()) ?>">
62+
<?= $block->escapeHtml($_rate->getMethodTitle()) ?>
6263
<?php $_excl = $block->getShippingPrice($_address, $_rate->getPrice(), $this->helper(Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()); ?>
6364
<?php $_incl = $block->getShippingPrice($_address, $_rate->getPrice(), true); ?>
64-
<?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
65+
<?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
6566
<span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
66-
<?php endif; ?>
67-
<?= $block->escapeHtml($_incl) ?>
68-
<?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
67+
<?php endif; ?>
68+
<?= $block->escapeHtml($_incl, ['span']) ?>
69+
<?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
70+
</span>
71+
<?php endif; ?>
72+
<?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
73+
<span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
74+
<?= $block->escapeHtml($_excl, ['span']) ?>
6975
</span>
70-
<?php endif; ?>
71-
<?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
72-
<span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>"><?= $block->escapeHtml($_excl) ?></span>
73-
<?php endif; ?>
76+
<?php endif; ?>
7477
</label>
7578
<?php endif ?>
7679
</div>
@@ -80,7 +83,7 @@
8083
<?php endforeach; ?>
8184
</dl>
8285
<?php endif; ?>
83-
<?= $block->escapeHtml($block->getItemsBoxTextAfter($_address)) ?>
86+
<?= /* @noEscape */ $block->getItemsBoxTextAfter($_address) ?>
8487
</div>
8588
</div>
8689
<div class="box box-items">

0 commit comments

Comments
 (0)