MAGETWO-80207: [2.2.x] - Modified Bundle.js because of breaking Encod…

…ing in Production Mode. #10563
magento · Oct 4, 2017 · f103832 · f103832
1 parent 850b9e5
commit f103832
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/app/code/Magento/Deploy/Package/Bundle/RequireJs.php b/app/code/Magento/Deploy/Package/Bundle/RequireJs.php
@@ -240,9 +240,12 @@ private function endBundleFile(WriteInterface $bundleFile, array $contents)
  private function getFileContent($sourcePath)
  {
  if (!isset($this->fileContent[$sourcePath])) {
- $this->fileContent[$sourcePath] = utf8_encode(
- $this->staticDir->readFile($this->minification->addMinifiedSign($sourcePath))
- );
+ $content = $this->staticDir->readFile($this->minification->addMinifiedSign($sourcePath));
+ if (mb_detect_encoding($content) !== "UTF-8") {
+ $content = mb_convert_encoding($content, "UTF-8");
+ }
+
+ $this->fileContent[$sourcePath] = $content;
  }
  return $this->fileContent[$sourcePath];
  }

diff --git a/lib/internal/Magento/Framework/View/Asset/Bundle.php b/lib/internal/Magento/Framework/View/Asset/Bundle.php
@@ -212,7 +212,11 @@ protected function getAssetContent(LocalInterface $asset)
  $assetContentType = $asset->getContentType();
  $assetKey = $this->getAssetKey($asset);
  if (!isset($this->assetsContent[$assetContextCode][$assetContentType][$assetKey])) {
- $this->assetsContent[$assetContextCode][$assetContentType][$assetKey] = utf8_encode($asset->getContent());
+ $content = $asset->getContent();
+ if (mb_detect_encoding($content) !== "UTF-8") {
+ $content = mb_convert_encoding($content, "UTF-8");
+ }
+ $this->assetsContent[$assetContextCode][$assetContentType][$assetKey] = $content;
  }
 
  return $this->assetsContent[$assetContextCode][$assetContentType][$assetKey];