Skip to content

Magento_Translation: avoid using deprecated escape* methods from Abst… #31711

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_Translation: avoid using deprecated escape* methods from Abst… #31711

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
9 changes: 5 additions & 4 deletions app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@

/**
* @var \Magento\Framework\View\Element\Template $block
* @var \Magento\Framework\Escaper $escaper
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
*/
?>
<link rel="stylesheet" type="text/css"
href="<?= $block->escapeUrl($block->getViewFileUrl('prototype/windows/themes/default.css')) ?>"/>
href="<?= $escaper->escapeUrl($block->getViewFileUrl('prototype/windows/themes/default.css')) ?>"/>
<link rel="stylesheet" type="text/css"
href="<?= $block->escapeUrl($block->getViewFileUrl('mage/translate-inline.css')) ?>"/>
href="<?= $escaper->escapeUrl($block->getViewFileUrl('mage/translate-inline.css')) ?>"/>

<script id="translate-inline-icon" type="text/x-magento-template">
<img src="<%- data.img %>" height="16" width="16" class="translate-edit-icon">
Expand Down Expand Up @@ -57,7 +58,7 @@
</script>

<div data-role="translate-dialog"
data-mage-init='{"translateInline":{"ajaxUrl":"<?= $block->escapeJs($block->escapeUrl($block->getAjaxUrl())) ?>"},
data-mage-init='{"translateInline":{"ajaxUrl":"<?= $escaper->escapeJs($escaper->escapeUrl($block->getAjaxUrl())) ?>"},
"loader":{}}'>
</div>
<?php $scriptString = <<<script
Expand All @@ -69,7 +70,7 @@ require([
], function($){
$('body').editTrigger(
{
img: '{$block->escapeJs($block->getViewFileUrl('Magento_Theme::fam_book_open.png'))}',
img: '{$escaper->escapeJs($block->getViewFileUrl('Magento_Theme::fam_book_open.png'))}',
alwaysShown: true,
singleElement: false
}
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/Translation/view/base/templates/translate.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

/**
* @var \Magento\Translation\Block\Js $block
* @var \Magento\Framework\Escaper $escaper
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
* @deprecated logic was refactored in order to not use localstorage at all.
*
Expand Down
15 changes: 9 additions & 6 deletions app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@
* See COPYING.txt for license details.
*/

/** @var \Magento\Framework\View\Element\Template $block */
/**
* @var \Magento\Framework\View\Element\Template $block
* @var \Magento\Framework\Escaper $escaper
*/
?>
<link rel="stylesheet" type="text/css" href="<?= $block->escapeUrl($block->getViewFileUrl('prototype/windows/themes/default.css')) ?>"/>
<link rel="stylesheet" type="text/css" href="<?= $block->escapeUrl($block->getViewFileUrl('Magento_Theme::prototype/magento.css')) ?>"/>
<link rel="stylesheet" type="text/css" href="<?= $block->escapeUrl($block->getViewFileUrl('mage/translate-inline.css')) ?>"/>
<link rel="stylesheet" type="text/css" href="<?= $escaper->escapeUrl($block->getViewFileUrl('prototype/windows/themes/default.css')) ?>"/>
<link rel="stylesheet" type="text/css" href="<?= $escaper->escapeUrl($block->getViewFileUrl('Magento_Theme::prototype/magento.css')) ?>"/>
<link rel="stylesheet" type="text/css" href="<?= $escaper->escapeUrl($block->getViewFileUrl('mage/translate-inline.css')) ?>"/>

<script id="translate-inline-icon" type="text/x-magento-template">
<img src="<%- data.img %>" height="16" width="16" class="translate-edit-icon">
Expand Down Expand Up @@ -54,12 +57,12 @@
</script>

<div data-role="translate-dialog"
data-mage-init='{"translateInline":{"ajaxUrl":"<?= $block->escapeJs($block->escapeUrl($block->getAjaxUrl())) ?>"},"loader":{}}'></div>
data-mage-init='{"translateInline":{"ajaxUrl":"<?= $escaper->escapeJs($escaper->escapeUrl($block->getAjaxUrl())) ?>"},"loader":{}}'></div>
<script type="text/x-magento-init">
{
"body": {
"editTrigger": {
"img": "<?= $block->escapeJs($block->escapeUrl($block->getViewFileUrl('Magento_Theme::fam_book_open.png'))) ?>",
"img": "<?= $escaper->escapeJs($escaper->escapeUrl($block->getViewFileUrl('Magento_Theme::fam_book_open.png'))) ?>",
"alwaysShown":true,
"singleElement":false
},
Expand Down