Skip to content

Commit 9735376

Browse files
authored
Modified Bundle.js because of breaking Encoding.
1 parent d19e900 commit 9735376

File tree

1 file changed

+5
-1
lines changed
  • lib/internal/Magento/Framework/View/Asset

1 file changed

+5
-1
lines changed

lib/internal/Magento/Framework/View/Asset/Bundle.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,11 @@ protected function getAssetContent(LocalInterface $asset)
212212
$assetContentType = $asset->getContentType();
213213
$assetKey = $this->getAssetKey($asset);
214214
if (!isset($this->assetsContent[$assetContextCode][$assetContentType][$assetKey])) {
215-
$this->assetsContent[$assetContextCode][$assetContentType][$assetKey] = utf8_encode($asset->getContent());
215+
$content = $asset->getContent();
216+
if (mb_detect_encoding($content) !== "UTF-8") {
217+
$content = mb_convert_encoding($content, "UTF-8");
218+
}
219+
$this->assetsContent[$assetContextCode][$assetContentType][$assetKey] = $content;
216220
}
217221

218222
return $this->assetsContent[$assetContextCode][$assetContentType][$assetKey];

0 commit comments

Comments
 (0)