Merge remote-tracking branch 'origin/MAGETWO-45017-widget-error' into PR_Branch

Author: Ivan Gavryshko

app/code/Magento/Widget/Model/Widget.php

@@ -277,7 +277,7 @@ public function getWidgetsArray($filters = [])
      */
     public function getWidgetDeclaration($type, $params = [], $asIs = true)
     {
-        $directive = '{{widget type="' . preg_quote($type) . '"';
+        $directive = '{{widget type="' . $type . '"';
 
         foreach ($params as $name => $value) {
             // Retrieve default option value if pre-configured

app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php

@@ -75,14 +75,6 @@ public function testGetWidgetByClassType()
         $this->assertNull($this->widget->getWidgetByClassType('type2'));
     }
 
-    public function testGetWidgetDeclarationTypeWithBackslashes()
-    {
-        $this->assertContains(
-            'Magento\\\\Widget\\\\Backslashed\\\\ClassName',
-            $this->widget->getWidgetDeclaration('Magento\Widget\Backslashed\ClassName')
-        );
-    }
-
     public function testGetConfigAsObject()
     {
         $configFile = __DIR__ . '/_files/mappedConfigArrayAll.php';

lib/web/mage/adminhtml/wysiwyg/widget.js

@@ -209,7 +209,7 @@ define([
             var descrCnt = $('widget-description-' + this.widgetEl.selectedIndex);
             if(noteCnt != undefined) {
                 var description = (descrCnt != undefined ? descrCnt.innerHTML : '');
-                noteCnt.update(descrCnt.innerHTML);
+                noteCnt.update(description);
             }
         },