Skip to content

Commit f724bb2

Browse files
zakdmazakdma
authored
Merge pull request #4603 from magento-tsg/2.2-develop-pr107
[TSG] Fixes for 2.2 (pr107) (2.2-develop)
2 parents 8abdc8e + 163b012 commit f724bb2

File tree

2 files changed

+56
-35
lines changed

2 files changed

+56
-35
lines changed

‎app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/state.phtml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
7-
// @codingStandardsIgnoreFile
86
?>
97
<?php
108
/**
@@ -14,36 +12,36 @@
1412
*/
1513
?>
1614
<?php $_filters = $block->getActiveFilters() ?>
17-
<?php if (!empty($_filters)): ?>
15+
<?php if (!empty($_filters)) : ?>
1816
<div class="filter-current" data-mage-init='{"collapsible":{"openedState": "active", "collapsible": true, "active": false }}'>
1917
<strong class="block-subtitle filter-current-subtitle"
2018
role="heading"
2119
aria-level="2"
2220
data-role="title"
23-
data-count="<?= count($_filters) ?>"><?= /* @escapeNotVerified */ __('Now Shopping by') ?></strong>
21+
data-count="<?= /* @noEscape */ count($_filters) ?>"><?= $block->escapeHtml(__('Now Shopping by')) ?></strong>
2422
<ol class="items">
25-
<?php foreach ($_filters as $_filter): ?>
23+
<?php foreach ($_filters as $_filter) : ?>
2624
<li class="item">
2725
<span class="filter-label"><?= $block->escapeHtml(__($_filter->getName())) ?></span>
28-
<span class="filter-value"><?= /* @escapeNotVerified */ $block->stripTags($_filter->getLabel()) ?></span>
26+
<span class="filter-value"><?= $block->escapeHtml($block->stripTags($_filter->getLabel())) ?></span>
2927
<?php
3028
$clearLinkUrl = $_filter->getClearLinkUrl();
31-
$currentFilterName = $block->escapeHtml(__($_filter->getName())) . " " . $block->stripTags($_filter->getLabel());
32-
if ($clearLinkUrl):
29+
$currentFilterName = $block->escapeHtmlAttr(__($_filter->getName()) . " " . $block->stripTags($_filter->getLabel()));
30+
if ($clearLinkUrl) :
3331
?>
34-
<a class="action previous" href="<?= /* @escapeNotVerified */ $_filter->getRemoveUrl() ?>"
35-
title="<?= /* @escapeNotVerified */ __('Previous') ?>">
36-
<span><?= /* @escapeNotVerified */ __('Previous') ?></span>
32+
<a class="action previous" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
33+
title="<?= $block->escapeHtmlAttr(__('Previous')) ?>">
34+
<span><?= $block->escapeHtml(__('Previous')) ?></span>
3735
</a>
3836
<a class="action remove"
39-
title="<?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>"
40-
href="<?= /* @escapeNotVerified */ $clearLinkUrl ?>">
37+
title="<?= $block->escapeHtmlAttr($_filter->getFilter()->getClearLinkText()) ?>"
38+
href="<?= $block->escapeUrl($clearLinkUrl) ?>">
4139
<span><?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
4240
</a>
43-
<?php else: ?>
44-
<a class="action remove" href="<?= /* @escapeNotVerified */ $_filter->getRemoveUrl() ?>"
45-
title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Remove')) . " " . $currentFilterName ?>">
46-
<span><?= /* @escapeNotVerified */ __('Remove This Item') ?></span>
41+
<?php else : ?>
42+
<a class="action remove" href="<?= $block->escapeUrl($_filter->getRemoveUrl()) ?>"
43+
title="<?= /* @noEscape */ $block->escapeHtmlAttr(__('Remove')) . " " . $currentFilterName ?>">
44+
<span><?= $block->escapeHtml(__('Remove This Item')) ?></span>
4745
</a>
4846
<?php endif; ?>
4947
</li>

‎app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/view.phtml

Lines changed: 41 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
7-
// @codingStandardsIgnoreFile
86
?>
97
<?php
108
/**
@@ -14,36 +12,61 @@
1412
*/
1513
?>
1614

17-
<?php if ($block->canShowBlock()): ?>
18-
<div class="block filter" id="layered-filter-block" data-mage-init='{"collapsible":{"openedState": "active", "collapsible": true, "active": false, "collateral": { "openedState": "filter-active", "element": "body" } }}'>
15+
<?php if ($block->canShowBlock()) : ?>
16+
<div class="block filter" id="layered-filter-block" data-mage-init='
17+
{
18+
"collapsible":
19+
{
20+
"openedState": "active",
21+
"collapsible": true,
22+
"active": false,
23+
"collateral":
24+
{
25+
"openedState": "filter-active",
26+
"element": "body"
27+
}
28+
}
29+
}'>
1930
<?php $filtered = count($block->getLayer()->getState()->getFilters()) ?>
20-
<div class="block-title filter-title" data-count="<?= /* @escapeNotVerified */ $filtered ?>">
21-
<strong data-role="title"><?= /* @escapeNotVerified */ __('Shop By') ?></strong>
31+
<div class="block-title filter-title" data-count="<?= /* @noEscape */ $filtered ?>">
32+
<strong data-role="title"><?= $block->escapeHtml(__('Shop By')); ?></strong>
2233
</div>
2334
<div class="block-content filter-content">
2435
<?= $block->getChildHtml('state') ?>
2536

26-
<?php if ($block->getLayer()->getState()->getFilters()): ?>
37+
<?php if ($block->getLayer()->getState()->getFilters()) : ?>
2738
<div class="block-actions filter-actions">
28-
<a href="<?= /* @escapeNotVerified */ $block->getClearUrl() ?>" class="action clear filter-clear"><span><?= /* @escapeNotVerified */ __('Clear All') ?></span></a>
39+
<a href="<?= $block->escapeUrl($block->getClearUrl()) ?>" class="action clear filter-clear">
40+
<span><?= $block->escapeHtml(__('Clear All')) ?></span>
41+
</a>
2942
</div>
3043
<?php endif; ?>
3144
<?php $wrapOptions = false; ?>
32-
<?php foreach ($block->getFilters() as $filter): ?>
33-
<?php if ($filter->getItemsCount()): ?>
34-
<?php if (!$wrapOptions): ?>
35-
<strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?= /* @escapeNotVerified */ __('Shopping Options') ?></strong>
36-
<div class="filter-options" id="narrow-by-list" data-role="content" data-mage-init='{"accordion":{"openedState": "active", "collapsible": true, "active": false, "multipleCollapsible": false}}'>
37-
<?php $wrapOptions = true; endif; ?>
45+
<?php foreach ($block->getFilters() as $filter) : ?>
46+
<?php if ($filter->getItemsCount()) : ?>
47+
<?php if (!$wrapOptions) : ?>
48+
<strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?= $block->escapeHtml(__('Shopping Options')) ?></strong>
49+
<div class="filter-options" id="narrow-by-list" data-role="content" data-mage-init='
50+
{
51+
"accordion":
52+
{
53+
"openedState": "active",
54+
"collapsible": true,
55+
"active": false,
56+
"multipleCollapsible": false
57+
}
58+
}'>
59+
<?php $wrapOptions = true;
60+
endif; ?>
3861
<div data-role="collapsible" class="filter-options-item">
39-
<div data-role="title" class="filter-options-title"><?= /* @escapeNotVerified */ __($filter->getName()) ?></div>
40-
<div data-role="content" class="filter-options-content"><?= /* @escapeNotVerified */ $block->getChildBlock('renderer')->render($filter) ?></div>
62+
<div data-role="title" class="filter-options-title"><?= $block->escapeHtml(__($filter->getName())) ?></div>
63+
<div data-role="content" class="filter-options-content"><?= /* @noEscape */ $block->getChildBlock('renderer')->render($filter) ?></div>
4164
</div>
4265
<?php endif; ?>
4366
<?php endforeach; ?>
44-
<?php if ($wrapOptions): ?>
67+
<?php if ($wrapOptions) : ?>
4568
</div>
46-
<?php else: ?>
69+
<?php else : ?>
4770
<script>
4871
require([
4972
'jquery'

0 commit comments

Comments
 (0)