Skip to content

Commit c7455cd

Browse files
committed
Merge remote-tracking branch 'origin/MC-35582' into 2.4.0-develop-pr64
2 parents 8cc7055 + e892d45 commit c7455cd

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $scriptString = <<<script
1818
releaseVisible: {$isReleaseVisible},
1919
}
2020
});
21-
script
21+
script;
2222
?>
2323

2424
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>

app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()): 0;
188188
$scriptString .= 'deps.push(\'mage/adminhtml/grid\');' . PHP_EOL;
189189

190190
$scriptString .= '
191-
require(deps, function('. ($block->getDependencyJsObject() ? 'registry' : '') .'){' . PHP_EOL .'
192-
//TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed' . PHP_EOL;
191+
require(deps, function('. ($block->getDependencyJsObject() ? 'registry' : '') .'){' . PHP_EOL;
192+
//TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed
193193
if ($block->getDependencyJsObject()) {
194194
$scriptString .= 'registry.get(\'' . $block->escapeJs($block->getDependencyJsObject()) .
195195
'\', function ('. $block->escapeJs($block->getDependencyJsObject()) . ') {' . PHP_EOL;

0 commit comments

Comments
 (0)