Skip to content

Commit

Permalink
Merge forwardport of #11048 to 2.3-develop branch
Browse files Browse the repository at this point in the history
Applied pull request patch https://github.com/magento/magento2/pull/11048.patch (created by @PieterCappelle) based on commit(s):
  1. c3ea1f5
  2. 0c0393d
  3. 6237877
  4. 202dd82

Fixed GitHub Issues in 2.3-develop branch:
  - #10417: Wysywig editor shows broken image icons (reported by @deadlyw1re)
  • Loading branch information
magento-engcom-team committed Feb 15, 2018
2 parents ac9c10b + c46acb7 commit 2c6c9c0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion app/code/Magento/Cms/Helper/Wysiwyg/Images.php
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,13 @@ public function getImageHtmlDeclaration($filename, $renderAsTag = false)
$html = $fileUrl;
} 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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,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));
Expand Down

0 comments on commit 2c6c9c0

Please sign in to comment.