Skip to content

Magento_AdvancedSearch: avoid using deprecated escape* methods from A… #31666

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

Magento_AdvancedSearch: avoid using deprecated escape* methods from A… #31666

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
12 changes: 8 additions & 4 deletions app/code/Magento/AdvancedSearch/view/adminhtml/templates/system/config/testconnection.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

/**
* @var \Magento\Framework\Escaper $escaper
*/
?>
<button class="scalable" type="button" id="<?= $block->getHtmlId() ?>" data-mage-init='{"testConnection":{
"url": "<?= $block->escapeUrl($block->getAjaxUrl()) ?>",
"url": "<?= $escaper->escapeUrl($block->getAjaxUrl()) ?>",
"elementId": "<?= $block->getHtmlId() ?>",
"successText": "<?= $block->escapeHtmlAttr(__('Successful! Test again?')) ?>",
"failedText": "<?= $block->escapeHtmlAttr(__('Connection failed! Test again?')) ?>",
"successText": "<?= $escaper->escapeHtmlAttr(__('Successful! Test again?')) ?>",
"failedText": "<?= $escaper->escapeHtmlAttr(__('Connection failed! Test again?')) ?>",
"fieldMapping": "<?= /* @noEscape */ $block->getFieldMapping() ?>"}, "validation": {}}'>
<span id="<?= $block->getHtmlId() ?>_result"><?= $block->escapeHtml($block->getButtonLabel()) ?></span>
<span id="<?= $block->getHtmlId() ?>_result"><?= $escaper->escapeHtml($block->getButtonLabel()) ?></span>
</button>
7 changes: 4 additions & 3 deletions app/code/Magento/AdvancedSearch/view/frontend/templates/search_data.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,19 @@

/**
* @var \Magento\AdvancedSearch\Block\SearchData $block
* @var \Magento\Framework\Escaper $escaper
*/
?>
<?php
/** @var \Magento\Search\Model\QueryResult[] $data */
$data = $block->getItems();
if (count($data)) : ?>
<dl class="block">
<dt class="title"><?= $block->escapeHtml(__($block->getTitle())) ?></dt>
<dt class="title"><?= $escaper->escapeHtml(__($block->getTitle())) ?></dt>
<?php foreach ($data as $additionalInfo) : ?>
<dd class="item">
<a href="<?= $block->escapeUrl($block->getLink($additionalInfo->getQueryText())) ?>"
><?= $block->escapeHtml($additionalInfo->getQueryText()) ?></a>
<a href="<?= $escaper->escapeUrl($block->getLink($additionalInfo->getQueryText())) ?>"
><?= $escaper->escapeHtml($additionalInfo->getQueryText()) ?></a>
<?php if ($block->isShowResultsCount()) : ?>
<span class="count"><?= /* @noEscape */ (int)$additionalInfo->getResultsCount() ?></span>
<?php endif; ?>
Expand Down