Escape Js Quote for layout updates

magento · Jun 10, 2016 · f93a4d5 · f93a4d5
1 parent ef6ad27
commit f93a4d5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstraction.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/DesignAbstraction.php
@@ -48,6 +48,18 @@ public function __construct(
         parent::__construct($context, $data);
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * Add escapeJsQuote on $label
+     */
+    public function addOption($value, $label, $params = [])
+    {
+        $label = $this->escapeJsQuote($label);
+
+        return parent::addOption($value, $label, $params);
+    }
+
     /**
      * Add necessary options
      *

diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php
@@ -32,6 +32,18 @@ public function __construct(
         parent::__construct($context, $data);
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * Add escapeJsQuote on $label
+     */
+    public function addOption($value, $label, $params = [])
+    {
+        $label = $this->escapeJsQuote($label);
+
+        return parent::addOption($value, $label, $params);
+    }
+
     /**
      * Add necessary options
      *