ENGCOM-3582: Fix for incorrectly escapeHtml'd JSON in commit b8f78cc #19422

magento-engcom-team · magento-engcom-team · commit e6779d44b14a · 2018-11-28T06:25:27.000-06:00
- Merge Pull Request #19422 from getjohn/magento2:2.2-cms-upload-fix - Merged commits: 1. 5357558 2. 05d5e20
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
@@ -108,7 +108,7 @@ require([
             fileTypes: /^image\/(gif|jpeg|png)$/,
             maxFileSize: <?= (int) $block->getFileSizeService()->getMaxFileSize() ?> * 10
         },
-        <?= $block->escapeHtml($resizeConfig) ?>,
+        <?= /* @noEscape */ $resizeConfig ?>,
         {
             action: 'save'
         }]

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ require([`
`108`	`108`	`fileTypes: /^image\/(gif\|jpeg\|png)$/,`
`109`	`109`	`maxFileSize: <?= (int) $block->getFileSizeService()->getMaxFileSize() ?> * 10`
`110`	`110`	`},`
`111`		`- <?= $block->escapeHtml($resizeConfig) ?>,`
	`111`	`+ <?= /* @noEscape */ $resizeConfig ?>,`
`112`	`112`	`{`
`113`	`113`	`action: 'save'`
`114`	`114`	`}]`