Merge pull request #1587 from magento-engcom/2.1-develop-prs

Public Pull Requests:
#11309

Author: Oleksii Korshenko

app/code/Magento/Cms/Helper/Wysiwyg/Images.php

@@ -177,7 +177,14 @@ public function getImageHtmlDeclaration($filename, $renderAsTag = false)
                 $html = $fileurl; // $mediaPath;
             } else {
                 $directive = $this->urlEncoder->encode($directive);
-                $html = $this->_backendData->getUrl('cms/wysiwyg/directive', ['___directive' => $directive]);
+
+                $html = $this->_backendData->getUrl(
+                    'cms/wysiwyg/directive',
+                    [
+                        '___directive' => $directive,
+                        '_escape_params' => false,
+                    ]
+                );
             }
         }
         return $html;

app/code/Magento/Cms/Test/Unit/Helper/Wysiwyg/ImagesTest.php

@@ -453,7 +453,7 @@ public function testGetImageHtmlDeclaration($baseUrl, $fileName, $isUsingStaticU
 
         $this->backendDataMock->expects($this->any())
             ->method('getUrl')
-            ->with('cms/wysiwyg/directive', ['___directive' => $directive])
+            ->with('cms/wysiwyg/directive', ['___directive' => $directive, '_escape_params' => false])
             ->willReturn($directive);
 
         $this->assertEquals($expectedHtml, $this->imagesHelper->getImageHtmlDeclaration($fileName));