- **Enhancing Exclusion Tests:** Now testing exclusion rules against …

…full open tag instead of only the CSS or JS URL and content. This allows for exclusion rules that exclude CSS or JS based on an opening tag attribute; e.g., `<style id='rs-plugin-settings-inline-css'`. See also: [this Comet Cache issue](wpsharks/comet-cache#614).
wpsharks · Nov 8, 2016 · 91d610a · 91d610a
1 parent 3d77bc0
commit 91d610a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/.build.props b/.build.props
@@ -3,6 +3,9 @@ project_title                    = WebSharks HTML Compressor
 project_owner                    = websharks
 project_slug                     = html-compressor
 
+project_text_domain              = html-compressor
+project_slack_channel            = html-compressor
+
 project_namespace                = WebSharks\\HtmlCompressor
 project_sub_namespace            = HtmlCompressor
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## $v
+
+- **Enhancing Exclusion Tests:** Now testing exclusion rules against full open tag instead of only the CSS or JS URL and content. This allows for exclusion rules that exclude CSS or JS based on an opening tag attribute; e.g., `<style id='rs-plugin-settings-inline-css'`. See also: [this Comet Cache issue](https://github.com/websharks/comet-cache/issues/614).
+
 ## v160118
 
 - Adding support for URI exclusions. See: https://github.com/websharks/zencache/issues/651

diff --git a/phings b/phings
diff --git a/src/includes/classes/Core.php b/src/includes/classes/Core.php
@@ -839,9 +839,9 @@ protected function getCssTagFrags(array $html_frag)
                         $_tag_frag_r['exclude'] = true;
                     } elseif ($_tag_frag_r['link_href'] && $_tag_frag_r['link_href_external'] && isset($this->options['compress_combine_remote_css_js']) && !$this->options['compress_combine_remote_css_js']) {
                         $_tag_frag_r['exclude'] = true;
-                    } elseif ($this->regex_css_exclusions && preg_match($this->regex_css_exclusions, $_tag_frag_r['link_href'].$_tag_frag_r['style_css'])) {
+                    } elseif ($this->regex_css_exclusions && preg_match($this->regex_css_exclusions, $_tag_frag_r['link_self_closing_tag'].' '.$_tag_frag_r['style_open_tag'].' '.$_tag_frag_r['style_css'])) {
                         $_tag_frag_r['exclude'] = true;
-                    } elseif ($this->built_in_regex_css_exclusions && preg_match($this->built_in_regex_css_exclusions, $_tag_frag_r['link_href'].$_tag_frag_r['style_css'])) {
+                    } elseif ($this->built_in_regex_css_exclusions && preg_match($this->built_in_regex_css_exclusions, $_tag_frag_r['link_self_closing_tag'].' '.$_tag_frag_r['style_open_tag'].' '.$_tag_frag_r['style_css'])) {
                         $_tag_frag_r['exclude'] = true;
                     }
                 }
@@ -1668,9 +1668,9 @@ protected function getJsTagFrags(array $html_frag)
                             $_tag_frag_r['exclude'] = true;
                         } elseif ($_tag_frag_r['script_src'] && $_tag_frag_r['script_src_external'] && isset($this->options['compress_combine_remote_css_js']) && !$this->options['compress_combine_remote_css_js']) {
                             $_tag_frag_r['exclude'] = true;
-                        } elseif ($this->regex_js_exclusions && preg_match($this->regex_js_exclusions, $_tag_frag_r['script_src'].$_tag_frag_r['script_js'].$_tag_frag_r['script_json'])) {
+                        } elseif ($this->regex_js_exclusions && preg_match($this->regex_js_exclusions, $_tag_frag_r['script_open_tag'].' '.$_tag_frag_r['script_js'].$_tag_frag_r['script_json'])) {
                             $_tag_frag_r['exclude'] = true;
-                        } elseif ($this->built_in_regex_js_exclusions && preg_match($this->built_in_regex_js_exclusions, $_tag_frag_r['script_src'].$_tag_frag_r['script_js'].$_tag_frag_r['script_json'])) {
+                        } elseif ($this->built_in_regex_js_exclusions && preg_match($this->built_in_regex_js_exclusions, $_tag_frag_r['script_open_tag'].' '.$_tag_frag_r['script_js'].$_tag_frag_r['script_json'])) {
                             $_tag_frag_r['exclude'] = true;
                         }
                     }