Merge remote-tracking branch 'origin/MAGETWO-95392' into 2.1.16-develop-pr58

Author: viktorpetryk

app/code/Magento/Widget/Block/Adminhtml/Widget.php

@@ -16,7 +16,7 @@
 class Widget extends \Magento\Backend\Block\Widget\Form\Container
 {
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -36,12 +36,16 @@ protected function _construct()
         $this->buttonList->update('save', 'region', 'footer');
         $this->buttonList->update('save', 'data_attribute', []);
 
-        $this->_formScripts[] = 'require(["mage/adminhtml/wysiwyg/widget"], function(){wWidget = new WysiwygWidget.Widget(' .
-            '"widget_options_form", "select_widget_type", "widget_options", "' .
-            $this->getUrl(
-                'adminhtml/*/loadOptions'
-            ) . '", "' . $this->getRequest()->getParam(
-                'widget_target_id'
-            ) . '");});';
+        $this->_formScripts[] = <<<EOJS
+ 	 		require(['mage/adminhtml/wysiwyg/widget'], function() {
+ 	 		    wWidget = new WysiwygWidget.Widget(
+ 	 		        'widget_options_form',
+ 	 		        'select_widget_type',
+ 	 		        'widget_options',
+ 	 		        '{$this->getUrl('adminhtml/*/loadOptions')}',
+ 	 		        '{$this->_escaper->escapeJs((string)$this->getRequest()->getParam('widget_target_id'))}'
+ 	 		    );
+ 	 		});
+EOJS;
     }
 }