Skip to content

Commit 6cc712c

Browse files
AC-11662 CSP - improve script rendering
1 parent ab919e4 commit 6cc712c

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

app/code/Magento/PageBuilder/view/adminhtml/templates/stage/render.phtml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/** @var \Magento\PageBuilder\Block\Adminhtml\Stage\Render $block
8-
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
7+
/**
8+
* @var \Magento\PageBuilder\Block\Adminhtml\Stage\Render $block
9+
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
910
*/
1011
?>
1112

@@ -47,7 +48,7 @@ $script .= <<<SCRIPT
4748
});
4849
4950
require(['Magento_PageBuilder/js/master-format/render/frame'], function (listen) {
50-
listen(${$pageBuilderConfig});
51+
listen({$pageBuilderConfig});
5152
});
5253
?>
5354
SCRIPT;

app/code/Magento/PageBuilder/view/adminhtml/templates/wysiwyg_setup.phtml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/** @var Magento\PageBuilder\Block\WysiwygSetup $block
8-
* @var Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
7+
/**
8+
* @var Magento\PageBuilder\Block\WysiwygSetup $block
9+
* @var Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
910
*/
1011

1112
?>

app/code/Magento/PageBuilder/view/base/templates/googlemaps.phtml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/** @var Magento\PageBuilder\Block\GoogleMapsApi $block
8-
* @var Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
9-
* @var Magento\Framework\Escaper $escaper
7+
/**
8+
* @var Magento\PageBuilder\Block\GoogleMapsApi $block
9+
* @var Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
10+
* @var Magento\Framework\Escaper $escaper
1011
*/
1112
?>
1213

@@ -31,7 +32,7 @@ $script = <<<SCRIPT
3132
}
3233
});
3334
SCRIPT;
34-
/** @noEscape */ echo $secureRenderer->renderTag('script', [], $script, false);
35+
echo $secureRenderer->renderTag('script', [], $script, false);
3536
?>
3637

3738
<?php
@@ -47,6 +48,6 @@ if ($block->shouldIncludeGoogleMapsLibrary()) {
4748
}
4849
});
4950
SCRIPT;
50-
/** @noEscape */ echo $secureRenderer->renderTag('script', [], $script, false);
51+
echo $secureRenderer->renderTag('script', [], $script, false);
5152
}
5253
?>

0 commit comments

Comments
 (0)