Merge pull request magento#4030 from magento-arcticfoxes/2.3-qwerty-pr

[arcticfoxes] Bug Fixes
Hypernova-Oy · Apr 16, 2019 · 77fbda2 · 77fbda2
2 parents 8753a58 + 68c7f5b
commit 77fbda2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php b/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);

diff --git a/app/code/Magento/Rule/Block/Editable.php b/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
                 ) . '&nbsp;';
         } else {