Skip to content

Replaced all escape functions from $block object to $escaper object as a part of Magento coding standards. #30639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Replaced all escape functions from $block object to $escaper object as a part of Magento coding standards. #30639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/state.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* Category layered navigation state
*
* @var $block \Magento\LayeredNavigation\Block\Navigation\State
* @var \Magento\Framework\Escaper $escaper
*/
?>
<?php $_filters = $block->getActiveFilters() ?>
Expand All @@ -20,30 +21,30 @@
role="heading"
aria-level="2"
data-role="title"
data-count="<?= /* @noEscape */ count($_filters) ?>"><?= $block->escapeHtml(__('Now Shopping by')) ?></strong>
data-count="<?= /* @noEscape */ count($_filters) ?>"><?= $escaper->escapeHtml(__('Now Shopping by')) ?></strong>
<ol class="items">
<?php foreach ($_filters as $_filter): ?>
<li class="item">
<span class="filter-label"><?= $block->escapeHtml(__($_filter->getName())) ?></span>
<span class="filter-value"><?= $block->escapeHtml($block->stripTags($_filter->getLabel())) ?></span>
<span class="filter-label"><?= $escaper->escapeHtml(__($_filter->getName())) ?></span>
<span class="filter-value"><?= $escaper->escapeHtml($block->stripTags($_filter->getLabel())) ?></span>
<?php
$clearLinkUrl = $_filter->getClearLinkUrl();
$currentFilterName = $block->escapeHtmlAttr(__($_filter->getName()) . " " . $block->stripTags($_filter->getLabel()));
$currentFilterName = $escaper->escapeHtmlAttr(__($_filter->getName()) . " " . $block->stripTags($_filter->getLabel()));
if ($clearLinkUrl):
?>
<a class="action previous" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
title="<?= $block->escapeHtmlAttr(__('Previous')) ?>">
<span><?= $block->escapeHtml(__('Previous')) ?></span>
<a class="action previous" href="<?= $escaper->escapeUrl($_filter->getRemoveUrl()) ?>"
title="<?= $escaper->escapeHtmlAttr(__('Previous')) ?>">
<span><?= $escaper->escapeHtml(__('Previous')) ?></span>
</a>
<a class="action remove"
title="<?= $block->escapeHtmlAttr($_filter->getFilter()->getClearLinkText()) ?>"
href="<?= $block->escapeUrl($clearLinkUrl) ?>">
<span><?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
title="<?= $escaper->escapeHtmlAttr($_filter->getFilter()->getClearLinkText()) ?>"
href="<?= $escaper->escapeUrl($clearLinkUrl) ?>">
<span><?= $escaper->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
</a>
<?php else: ?>
<a class="action remove" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
title="<?= /* @noEscape */ $block->escapeHtmlAttr(__('Remove')) . " " . $currentFilterName ?>">
<span><?= $block->escapeHtml(__('Remove This Item')) ?></span>
<a class="action remove" href="<?= $escaper->escapeUrl($_filter->getRemoveUrl()) ?>"
title="<?= /* @noEscape */ $escaper->escapeHtmlAttr(__('Remove')) . " " . $currentFilterName ?>">
<span><?= $escaper->escapeHtml(__('Remove This Item')) ?></span>
</a>
<?php endif; ?>
</li>
Expand Down
11 changes: 6 additions & 5 deletions app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/view.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* Category layered navigation
*
* @var $block \Magento\LayeredNavigation\Block\Navigation
* @var \Magento\Framework\Escaper $escaper
*/
?>

Expand All @@ -29,23 +30,23 @@
}'>
<?php $filtered = count($block->getLayer()->getState()->getFilters()) ?>
<div class="block-title filter-title" data-count="<?= /* @noEscape */ $filtered ?>">
<strong data-role="title"><?= $block->escapeHtml(__('Shop By')); ?></strong>
<strong data-role="title"><?= $escaper->escapeHtml(__('Shop By')); ?></strong>
</div>
<div class="block-content filter-content">
<?= $block->getChildHtml('state') ?>

<?php if ($block->getLayer()->getState()->getFilters()) : ?>
<div class="block-actions filter-actions">
<a href="<?= $block->escapeUrl($block->getClearUrl()) ?>" class="action clear filter-clear">
<span><?= $block->escapeHtml(__('Clear All')) ?></span>
<a href="<?= $escaper->escapeUrl($block->getClearUrl()) ?>" class="action clear filter-clear">
<span><?= $escaper->escapeHtml(__('Clear All')) ?></span>
</a>
</div>
<?php endif; ?>
<?php $wrapOptions = false; ?>
<?php foreach ($block->getFilters() as $filter) : ?>
<?php if ($filter->getItemsCount()) : ?>
<?php if (!$wrapOptions) : ?>
<strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?= $block->escapeHtml(__('Shopping Options')) ?></strong>
<strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?= $escaper->escapeHtml(__('Shopping Options')) ?></strong>
<div class="filter-options" id="narrow-by-list" data-role="content" data-mage-init='
{
"accordion":
Expand All @@ -59,7 +60,7 @@
<?php $wrapOptions = true;
endif; ?>
<div data-role="collapsible" class="filter-options-item">
<div data-role="title" class="filter-options-title"><?= $block->escapeHtml(__($filter->getName())) ?></div>
<div data-role="title" class="filter-options-title"><?= $escaper->escapeHtml(__($filter->getName())) ?></div>
<div data-role="content" class="filter-options-content"><?= /* @noEscape */ $block->getChildBlock('renderer')->render($filter) ?></div>
</div>
<?php endif; ?>
Expand Down