Merge remote-tracking branch 'arcticfoxes/MC-15571' into 2.3-qwerty-pr

Author: Joan He

app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php

@@ -97,6 +97,9 @@ public function execute()
                     unset($data['rule']);
                 }
 
+                unset($data['conditions_serialized']);
+                unset($data['actions_serialized']);
+
                 $model->loadPost($data);
 
                 $this->_objectManager->get(\Magento\Backend\Model\Session::class)->setPageData($data);

app/code/Magento/Rule/Block/Editable.php

@@ -58,11 +58,11 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
                 '" name="' .
                 $this->escapeHtmlAttr($element->getName()) .
                 '" value="' .
-                $element->getValue() .
+                $this->escapeHtmlAttr($element->getValue()) .
                 '" data-form-part="' .
-                $element->getData('data-form-part') .
+                $this->escapeHtmlAttr($element->getData('data-form-part')) .
                 '"/> ' .
-                htmlspecialchars(
+                $this->escapeHtml(
                     $valueName
                 ) . ' ';
         } else {