Merge branch 'MAGETWO-88656' into 2.1.15-bugfixes-210618

Dmytro Voskoboinikov · Dmytro Voskoboinikov · commit 895b984647ee · 2018-06-21T16:45:12.000+03:00
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Widget/Chooser.php
@@ -87,7 +87,7 @@ public function prepareElementHtml(\Magento\Framework\Data\Form\Element\Abstract
         if ($element->getValue()) {
             $rule = $this->ruleFactory->create()->load((int)$element->getValue());
             if ($rule->getId()) {
-                $chooser->setLabel($rule->getName());
+                $chooser->setLabel($this->escapeHtml($rule->getName()));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function prepareElementHtml(\Magento\Framework\Data\Form\Element\Abstract`
`87`	`87`	`if ($element->getValue()) {`
`88`	`88`	`$rule = $this->ruleFactory->create()->load((int)$element->getValue());`
`89`	`89`	`if ($rule->getId()) {`
`90`		`- $chooser->setLabel($rule->getName());`
	`90`	`+ $chooser->setLabel($this->escapeHtml($rule->getName()));`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`