Skip to content

Commit b3a7610

Browse files
author
Joan He
committed
MAGETWO-99282: Eliminate @escapeNotVerified in Magento_Catalog module
1 parent f40f24c commit b3a7610

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

‎app/code/Magento/Catalog/view/adminhtml/templates/product/edit/tabs.phtml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
<div id="<?= $block->escapeHtmlAttr($block->getId()) ?>"
1616
data-mage-init='{"tabs":{
17-
"active": "<?= $block->escapeJs($block->escapeHtmlAttr($block->getActiveTabId())) ?>",
18-
"destination": "#<?= $block->escapeJs($block->escapeHtmlAttr($block->getDestElementId())) ?>",
17+
"active": "<?= $block->escapeHtmlAttr($block->getActiveTabId()) ?>",
18+
"destination": "#<?= $block->escapeHtmlAttr($block->getDestElementId()) ?>",
1919
"shadowTabs": "<?= /* @noEscape */ $block->getAllShadowTabs() ?>",
20-
"tabsBlockPrefix": "<?= $block->escapeJs($block->escapeHtmlAttr($block->getId())) ?>_",
20+
"tabsBlockPrefix": "<?= $block->escapeHtmlAttr($block->getId()) ?>_",
2121
"tabIdArgument": "active_tab",
22-
"tabPanelClass": "<?= $block->escapeJs($block->escapeHtmlAttr($block->getPanelsClass())) ?>",
23-
"excludedPanel": "<?= $block->escapeJs($block->escapeHtmlAttr($block->getExcludedPanel())) ?>",
22+
"tabPanelClass": "<?= $block->escapeHtmlAttr($block->getPanelsClass()) ?>",
23+
"excludedPanel": "<?= $block->escapeHtmlAttr($block->getExcludedPanel()) ?>",
2424
"groups": "ul.tabs"
2525
}}'>
2626
<?php foreach ($tabGroups as $tabGroupCode) :?>

‎app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ switch ($type = $block->getType()) {
218218
<div class="actions-primary">
219219
<?php if ($_item->isSaleable()) :?>
220220
<?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)) :?>
221-
<button class="action tocart primary" data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeJs($block->escapeUrl($block->getAddToCartUrl($_item))) ?>"}}' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
221+
<button class="action tocart primary" data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
222222
<span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
223223
</button>
224224
<?php else :?>

‎app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
6161

6262
if ($_product->isSaleable()) {
6363
$info['button'] = '<button type="button" title="' . $block->escapeHtmlAttr(__('Add to Cart')) . '" class="action tocart"'
64-
. ' data-mage-init=\'{ "redirectUrl": { "event": "click", url: "' . $block->escapeJs($block->escapeUrl($block->getAddToCartUrl($_product))) . '"} }\'>'
64+
. ' data-mage-init=\'{ "redirectUrl": { "event": "click", url: "' . $block->escapeUrl($block->getAddToCartUrl($_product)) . '"} }\'>'
6565
. '<span>' . $block->escapeHtml(__('Add to Cart')) . '</span></button>';
6666
} else {
6767
$info['button'] = $_product->getIsSalable() ? '<div class="stock available"><span>' . $block->escapeHtml(__('In stock')) . '</span></div>' :

‎app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/general.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
<meta property="og:type" content="product" />
1111
<meta property="og:title"
12-
content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getName())) ?>" />
12+
content="<?= /* @noEscape */ $block->stripTags($block->getProduct()->getName()) ?>" />
1313
<meta property="og:image"
1414
content="<?= $block->escapeUrl($block->getImage($block->getProduct(), 'product_base_image')->getImageUrl()) ?>" />
1515
<meta property="og:description"
16-
content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getShortDescription())) ?>" />
16+
content="<?= /* @noEscape */ $block->stripTags($block->getProduct()->getShortDescription()) ?>" />
1717
<meta property="og:url" content="<?= $block->escapeUrl($block->getProduct()->getProductUrl()) ?>" />
1818
<?php if ($priceAmount = $block->getProduct()->getPriceInfo()->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE)->getAmount()) :?>
1919
<meta property="product:price:amount" content="<?= $block->escapeHtmlAttr($priceAmount) ?>"/>

‎app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<?php if (!$_product->getTypeInstance()->isPossibleBuyFromList($_product)) :?>
3838
<button type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>"
3939
class="action tocart primary"
40-
data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeJs($block->escapeUrl($block->getAddToCartUrl($_product))) ?>"}}'>
40+
data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_product)) ?>"}}'>
4141
<span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
4242
</button>
4343
<?php else :?>

‎app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
6868
<?php if ($_item->isSaleable()) :?>
6969
<?php if (!$_item->getTypeInstance()->isPossibleBuyFromList($_item)) :?>
7070
<button class="action tocart primary"
71-
data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeJs($block->escapeUrl($block->getAddToCartUrl($_item))) ?>"}}'
71+
data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
7272
type="button"
7373
title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
7474
<span><?= $block->escapeHtml(__('Add to Cart')) ?></span>

‎app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
7171
<?php if (!$_item->getTypeInstance()->isPossibleBuyFromList($_item)
7272
) :?>
7373
<button class="action tocart primary"
74-
data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeJs($block->escapeUrl($block->getAddToCartUrl($_item))) ?>"}}'
74+
data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
7575
type="button"
7676
title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
7777
<span><?= $block->escapeHtml(__('Add to Cart')) ?></span>

0 commit comments

Comments
 (0)