Merge branch 'AC-10021' into cia-2.4.8-beta1-develop-bugfix-09022024

pawan-adobe-security · pawan-adobe-security · commit aa47abeae42b · 2024-09-02T10:48:32.000+05:30
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Block/Widget/Chooser.php b/app/code/Magento/Cms/Block/Adminhtml/Block/Widget/Chooser.php
@@ -96,7 +96,7 @@ public function prepareElementHtml(\Magento\Framework\Data\Form\Element\Abstract
      */
     public function getRowClickCallback()
     {
-        $chooserJsObject = $this->getId();
+        $chooserJsObject = $this->_escaper->escapeJs($this->getId());
         $js = '
             function (grid, event) {
                 var trElement = Event.findElement(event, "tr");
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
@@ -8,7 +8,6 @@
 /**
  * CMS page chooser for Wysiwyg CMS widget
  *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -65,7 +64,6 @@ public function __construct(
     protected function _construct()
     {
         parent::_construct();
-        //$this->setDefaultSort('name');
         $this->setUseAjax(true);
         $this->setDefaultFilter(['chooser_is_active' => '1']);
     }
@@ -113,7 +111,7 @@ public function prepareElementHtml(\Magento\Framework\Data\Form\Element\Abstract
      */
     public function getRowClickCallback()
     {
-        $chooserJsObject = $this->getId();
+        $chooserJsObject = $this->_escaper->escapeJs($this->getId());
         $js = '
             function (grid, event) {
                 var trElement = Event.findElement(event, "tr");
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php
@@ -106,7 +106,7 @@ public function prepareElementHtml(\Magento\Framework\Data\Form\Element\Abstract
      */
     public function getRowClickCallback()
     {
-        $chooserJsObject = $this->getId();
+        $chooserJsObject = $this->_escaper->escapeJs($this->getId());
         $js = '
             function (grid, event) {
                 var trElement = Event.findElement(event, "tr");

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function prepareElementHtml(\Magento\Framework\Data\Form\Element\Abstract`
`96`	`96`	`*/`
`97`	`97`	`public function getRowClickCallback()`
`98`	`98`	`{`
`99`		`- $chooserJsObject = $this->getId();`
	`99`	`+ $chooserJsObject = $this->_escaper->escapeJs($this->getId());`
`100`	`100`	`$js = '`
`101`	`101`	`function (grid, event) {`
`102`	`102`	`var trElement = Event.findElement(event, "tr");`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`/**`
`9`	`9`	`* CMS page chooser for Wysiwyg CMS widget`
`10`	`10`	`*`
`11`		`- * @author Magento Core Team <core@magentocommerce.com>`
`12`	`11`	`*/`
`13`	`12`	`class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended`
`14`	`13`	`{`
`@@ -65,7 +64,6 @@ public function __construct(`
`65`	`64`	`protected function _construct()`
`66`	`65`	`{`
`67`	`66`	`parent::_construct();`
`68`		`- //$this->setDefaultSort('name');`
`69`	`67`	`$this->setUseAjax(true);`
`70`	`68`	`$this->setDefaultFilter(['chooser_is_active' => '1']);`
`71`	`69`	`}`
`@@ -113,7 +111,7 @@ public function prepareElementHtml(\Magento\Framework\Data\Form\Element\Abstract`
`113`	`111`	`*/`
`114`	`112`	`public function getRowClickCallback()`
`115`	`113`	`{`
`116`		`- $chooserJsObject = $this->getId();`
	`114`	`+ $chooserJsObject = $this->_escaper->escapeJs($this->getId());`
`117`	`115`	`$js = '`
`118`	`116`	`function (grid, event) {`
`119`	`117`	`var trElement = Event.findElement(event, "tr");`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function prepareElementHtml(\Magento\Framework\Data\Form\Element\Abstract`
`106`	`106`	`*/`
`107`	`107`	`public function getRowClickCallback()`
`108`	`108`	`{`
`109`		`- $chooserJsObject = $this->getId();`
	`109`	`+ $chooserJsObject = $this->_escaper->escapeJs($this->getId());`
`110`	`110`	`$js = '`
`111`	`111`	`function (grid, event) {`
`112`	`112`	`var trElement = Event.findElement(event, "tr");`