Skip to content

Commit 62aba85

Browse files
AC-11662 CSP - improve script rendering
1 parent 4a5176a commit 62aba85

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66

77
/**
88
* @var Magento\PageBuilder\Block\GoogleMapsApi $block
9-
* @var Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
10-
* @var Magento\Framework\Escaper $escaper
9+
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
10+
* @var \Magento\Framework\Escaper $escaper
1111
*/
12-
?>
1312

14-
<?php
1513
$script = <<<SCRIPT
1614
require.config({
1715
paths: {
@@ -32,10 +30,9 @@ $script = <<<SCRIPT
3230
}
3331
});
3432
SCRIPT;
35-
?>
36-
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $script, false) ?>
3733

38-
<?php
34+
echo /* @noEscape */ $secureRenderer->renderTag('script', [], $script, false);
35+
3936
/** Include the googleMaps dependency only if we have an API key set, this removes unnecessary calls to Google */
4037
if ($block->shouldIncludeGoogleMapsLibrary()) {
4138
$script = <<<SCRIPT
@@ -48,7 +45,6 @@ if ($block->shouldIncludeGoogleMapsLibrary()) {
4845
}
4946
});
5047
SCRIPT;
51-
//phpcs:ignore
48+
5249
echo /* @noEscape */ $secureRenderer->renderTag('script', [], $script, false);
5350
}
54-
?>

0 commit comments

Comments
 (0)