Skip to content

Magento_ProductAlert: avoid using deprecated escape* methods from Abs… #31691

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_ProductAlert: avoid using deprecated escape* methods from Abs… #31691

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
10 changes: 6 additions & 4 deletions app/code/Magento/ProductAlert/view/frontend/templates/email/email.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
* See COPYING.txt for license details.
*/

/** @var $block Magento\Framework\View\Element\Template */
/**
* @var Magento\Framework\View\Element\Template $block
* @var \Magento\Framework\Escaper $escaper
*/
?>

<form action="<?= $block->escapeUrl($block->getUrl('productalert/unsubscribe/stock')) ?>"
<form action="<?= $escaper->escapeUrl($block->getUrl('productalert/unsubscribe/stock')) ?>"
method="post"
data-form="unsubscription_form">
<?= /* @noEscape */ $block->getBlockHtml('formkey') ?>
<input type="hidden" id="productId" name="product" value="<?= $block->escapeHtml($block->getProductId()) ?>" />
<input type="hidden" id="productId" name="product" value="<?= $escaper->escapeHtml($block->getProductId()) ?>" />
</form>
<script type="text/x-magento-init">
{
Expand Down
15 changes: 9 additions & 6 deletions app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,26 @@
* See COPYING.txt for license details.
*/

/** @var $block \Magento\ProductAlert\Block\Email\Price */
/**
* @var \Magento\ProductAlert\Block\Email\Price $block
* @var \Magento\Framework\Escaper $escaper
*/
?>
<?php if ($_products = $block->getProducts()) : ?>
<p><?= $block->escapeHtml(__('Price change alert! We wanted you to know that prices have changed for these products:')) ?></p>
<p><?= $escaper->escapeHtml(__('Price change alert! We wanted you to know that prices have changed for these products:')) ?></p>
<table>
<?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
<?php foreach ($_products as $_product) : ?>
<tr>
<td class="col photo">
<a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>" title="<?= $block->escapeHtml($_product->getName()) ?>" class="product photo">
<a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>" title="<?= $escaper->escapeHtml($_product->getName()) ?>" class="product photo">
<?= $block->getImage($_product, 'product_thumbnail_image', ['class' => 'photo image'])->toHtml() ?>
</a>
</td>
<td class="col item">
<p>
<strong class="product name">
<a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"><?= $block->escapeHtml($_product->getName()) ?></a>
<a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"><?= $escaper->escapeHtml($_product->getName()) ?></a>
</strong>
</p>
<?php if ($shortDescription = $block->getFilteredContent($_product->getShortDescription())) : ?>
Expand All @@ -36,10 +39,10 @@
]
);
?>
<p><small><a href="<?= $block->escapeUrl($block->getProductUnsubscribeUrl($_product->getId())) ?>"><?= $block->escapeHtml(__('Click here to stop alerts for this product.')) ?></a></small></p>
<p><small><a href="<?= $escaper->escapeUrl($block->getProductUnsubscribeUrl($_product->getId())) ?>"><?= $escaper->escapeHtml(__('Click here to stop alerts for this product.')) ?></a></small></p>
</td>
</tr>
<?php endforeach; ?>
</table>
<p><a href="<?= $block->escapeUrl($block->getUnsubscribeUrl()) ?>"><?= $block->escapeHtml(__('Unsubscribe from all price alerts')) ?></a></p>
<p><a href="<?= $escaper->escapeUrl($block->getUnsubscribeUrl()) ?>"><?= $escaper->escapeHtml(__('Unsubscribe from all price alerts')) ?></a></p>
<?php endif; ?>
15 changes: 9 additions & 6 deletions app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,25 @@
* See COPYING.txt for license details.
*/

/** @var $block \Magento\ProductAlert\Block\Email\Stock */
/**
* @var \Magento\ProductAlert\Block\Email\Stock $block
* @var \Magento\Framework\Escaper $escaper
*/
?>
<?php if ($_products = $block->getProducts()) : ?>
<p><?= $block->escapeHtml(__('In stock alert! We wanted you to know that these products are now available:')) ?></p>
<p><?= $escaper->escapeHtml(__('In stock alert! We wanted you to know that these products are now available:')) ?></p>
<table>
<?php foreach ($_products as $_product) : ?>
<tr>
<td class="col photo">
<a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>" title="<?= $block->escapeHtml($_product->getName()) ?>" class="product photo">
<a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>" title="<?= $escaper->escapeHtml($_product->getName()) ?>" class="product photo">
<?= $block->getImage($_product, 'product_thumbnail_image', ['class' => 'photo image'])->toHtml() ?>
</a>
</td>
<td class="col item">
<p>
<strong class="product name">
<a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"><?= $block->escapeHtml($_product->getName()) ?></a>
<a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"><?= $escaper->escapeHtml($_product->getName()) ?></a>
</strong>
</p>
<?php if ($shortDescription = $block->getFilteredContent($_product->getShortDescription())) : ?>
Expand All @@ -35,10 +38,10 @@
]
);
?>
<p><small><a href="<?= $block->escapeUrl($block->getProductUnsubscribeUrl($_product->getId())) ?>"><?= $block->escapeHtml(__('Click here to stop alerts for this product.')) ?></a></small></p>
<p><small><a href="<?= $escaper->escapeUrl($block->getProductUnsubscribeUrl($_product->getId())) ?>"><?= $escaper->escapeHtml(__('Click here to stop alerts for this product.')) ?></a></small></p>
</td>
</tr>
<?php endforeach; ?>
</table>
<p><a href="<?= $block->escapeUrl($block->getUnsubscribeUrl()) ?>"><?= $block->escapeHtml(__('Unsubscribe from all stock alerts')) ?></a></p>
<p><a href="<?= $escaper->escapeUrl($block->getUnsubscribeUrl()) ?>"><?= $escaper->escapeHtml(__('Unsubscribe from all stock alerts')) ?></a></p>
<?php endif; ?>
12 changes: 8 additions & 4 deletions app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

/**
* @var \Magento\ProductAlert\Block\Product\View $block
* @var \Magento\Framework\Escaper $escaper
*/
?>
<?php /* @var $block \Magento\ProductAlert\Block\Product\View */?>
<div class="product alert <?= $block->getHtmlClass() ?>">
<a href="<?= $block->escapeUrl($block->getSignupUrl()) ?>"
title="<?= $block->escapeHtml(__($block->getSignupLabel())) ?>" class="action alert">
<?= $block->escapeHtml(__($block->getSignupLabel())) ?>
<a href="<?= $escaper->escapeUrl($block->getSignupUrl()) ?>"
title="<?= $escaper->escapeHtml(__($block->getSignupLabel())) ?>" class="action alert">
<?= $escaper->escapeHtml(__($block->getSignupLabel())) ?>
</a>
</div>