From 9760113033c64744196a39f45cfe88d1950c252d Mon Sep 17 00:00:00 2001
From: sergey <sergey.nezbritskiy@gmail.com>
Date: Sat, 16 Jan 2021 15:09:15 +0200
Subject: [PATCH] Magento_Search: Avoid using deprecated escape* methods from
 AbstractBlock

---
 app/code/Magento/Search/Block/Adminhtml/Term/Edit.php      | 2 +-
 app/code/Magento/Search/view/frontend/templates/term.phtml | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php b/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php
index 62c06e490650c..aecc0976da564 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php
@@ -55,7 +55,7 @@ protected function _construct()
     public function getHeaderText()
     {
         if ($this->coreRegistry->registry('current_catalog_search')->getId()) {
-            $queryText = $this->escapeHtml($this->coreRegistry->registry('current_catalog_search')->getQueryText());
+            $queryText = $this->_escaper->escapeHtml($this->coreRegistry->registry('current_catalog_search')->getQueryText());
             return __("Edit Search '%1'", $queryText);
         } else {
             return __('New Search');
diff --git a/app/code/Magento/Search/view/frontend/templates/term.phtml b/app/code/Magento/Search/view/frontend/templates/term.phtml
index 51f40e8247ccf..e46d57c16ee0b 100644
--- a/app/code/Magento/Search/view/frontend/templates/term.phtml
+++ b/app/code/Magento/Search/view/frontend/templates/term.phtml
@@ -6,6 +6,7 @@
 
 /**
  * @var \Magento\Search\Block\Term $block
+ * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
@@ -13,8 +14,8 @@
     <ul class="search-terms">
         <?php foreach ($block->getTerms() as $_term): ?>
             <li id="term-<?= /* @noEscape */ $_term->getId() ?>" class="item">
-                <a href="<?= $block->escapeUrl($block->getSearchUrl($_term)) ?>">
-                    <?= $block->escapeHtml($_term->getQueryText()) ?>
+                <a href="<?= $escaper->escapeUrl($block->getSearchUrl($_term)) ?>">
+                    <?= $escaper->escapeHtml($_term->getQueryText()) ?>
                 </a>
             </li>
             <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
@@ -25,6 +26,6 @@
     </ul>
 <?php else: ?>
     <div class="message notice">
-        <div><?= $block->escapeHtml(__('There are no search terms available.')) ?></div>
+        <div><?= $escaper->escapeHtml(__('There are no search terms available.')) ?></div>
     </div>
 <?php endif; ?>