File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed
lib/internal/Magento/Framework/View/Asset Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -212,7 +212,11 @@ protected function getAssetContent(LocalInterface $asset)
212
212
$ assetContentType = $ asset ->getContentType ();
213
213
$ assetKey = $ this ->getAssetKey ($ asset );
214
214
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 ;
216
220
}
217
221
218
222
return $ this ->assetsContent [$ assetContextCode ][$ assetContentType ][$ assetKey ];
You can’t perform that action at this time.
0 commit comments