Skip to content

Commit a5bb946

Browse files
ENGCOM-6228: Fixed broken resources page when acl has quote (') in title. #25204
2 parents 1993e18 + bebf42d commit a5bb946

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838
<label class="label"><span><?= $block->escapeHtml(__('Resources')) ?></span></label>
3939

4040
<div class="control">
41-
<div class="tree x-tree" data-role="resource-tree" data-mage-init='<?= /* @noEscape */
42-
$block->getJsonSerializer()->serialize([
41+
<div class="tree x-tree" data-role="resource-tree" data-mage-init='<?=
42+
$block->escapeHtmlAttr($block->getJsonSerializer()->serialize([
4343
'rolesTree' => [
4444
"treeInitData" => $block->getTree(),
4545
"treeInitSelectedData" => $block->getSelectedResources(),
4646
],
47-
]); ?>'>
47+
])); ?>'>
4848
</div>
4949
</div>
5050
</div>

app/code/Magento/User/view/adminhtml/templates/role/edit.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838
<label class="label"><span><?= $block->escapeHtml(__('Resources')) ?></span></label>
3939

4040
<div class="control">
41-
<div class="tree x-tree" data-role="resource-tree" data-mage-init='<?= /* @noEscape */
42-
$block->getJsonSerializer()->serialize([
41+
<div class="tree x-tree" data-role="resource-tree" data-mage-init='<?=
42+
$block->escapeHtmlAttr($block->getJsonSerializer()->serialize([
4343
'rolesTree' => [
4444
"treeInitData" => $block->getTree(),
4545
"treeInitSelectedData" => $block->getSelectedResources(),
4646
],
47-
]); ?>'>
47+
])); ?>'>
4848
</div>
4949
</div>
5050
</div>

0 commit comments

Comments
 (0)