From 9b93a93421fec669e7f11c8795b80edb41d85504 Mon Sep 17 00:00:00 2001 From: jaswsinc Date: Thu, 20 Aug 2015 21:04:25 -0800 Subject: [PATCH] `stripUtf8Bom()` from remote JS files and inline JS/CSS. See: websharks/html-compressor#69 --- src/includes/classes/Core.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/includes/classes/Core.php b/src/includes/classes/Core.php index a9b52b6..ae1c440 100644 --- a/src/includes/classes/Core.php +++ b/src/includes/classes/Core.php @@ -1037,10 +1037,8 @@ protected function resolveResolvedCssImportsCb(array $m) if (!empty($m['media']) && $m['media'] !== $this->current_css_media) { return $m[0]; // Not possible; different media. } - if (($css = $this->remote($m['url']))) { - if (($css = $this->stripUtf8Bom($css))) { - $css = $this->resolveCssRelatives($css, $m['url']); - } + if (($css = $this->stripUtf8Bom($this->remote($m['url'])))) { + $css = $this->resolveCssRelatives($css, $m['url']); } return $css; } @@ -1340,7 +1338,7 @@ protected function compileJsTagFragsIntoParts(array $js_tag_frags, $for) } } elseif ($_js_tag_frag['script_src']) { if (($_js_tag_frag['script_src'] = $this->resolveRelativeUrl($_js_tag_frag['script_src']))) { - if (($_js_code = $this->remote($_js_tag_frag['script_src']))) { + if (($_js_code = $this->stripUtf8Bom($this->remote($_js_tag_frag['script_src'])))) { $_js_code = rtrim($_js_code, ';').';'; if ($_js_code) { @@ -1354,6 +1352,7 @@ protected function compileJsTagFragsIntoParts(array $js_tag_frags, $for) } } elseif ($_js_tag_frag['script_js']) { $_js_code = $_js_tag_frag['script_js']; + $_js_code = $this->stripUtf8Bom($_js_code); $_js_code = rtrim($_js_code, ';').';'; if ($_js_code) {