diff --git a/classes/autoptimizeCache.php b/classes/autoptimizeCache.php index 34ecaed1..095e90cd 100644 --- a/classes/autoptimizeCache.php +++ b/classes/autoptimizeCache.php @@ -94,7 +94,7 @@ function autoptimize_do_cachepurged_action() { do_action("autoptimize_action_cachepurged"); } } - add_action("plugins_loaded","autoptimize_do_cachepurged_action",11); + add_action("after_theme_setup","autoptimize_do_cachepurged_action",11); // try to purge caching plugins cache-files? include_once(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizePageCacheFlush.php'); diff --git a/classes/autoptimizeScripts.php b/classes/autoptimizeScripts.php index bebbfaa2..8884b9b5 100644 --- a/classes/autoptimizeScripts.php +++ b/classes/autoptimizeScripts.php @@ -346,7 +346,7 @@ private function ismergeable($tag) { //Checks agains the blacklist private function ismovable($tag) { - if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable',false)) { + if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable',true)) { return false; } diff --git a/classes/autoptimizeStyles.php b/classes/autoptimizeStyles.php index 81168f65..8edb1c3c 100644 --- a/classes/autoptimizeStyles.php +++ b/classes/autoptimizeStyles.php @@ -391,12 +391,10 @@ public function minify() { } // CDN the fonts! - if ((!empty($this->cdn_url))&&apply_filters("autoptimize_filter_css_fonts_cdn",false)) { + if ( (!empty($this->cdn_url)) && (apply_filters('autoptimize_filter_css_fonts_cdn',false)) && (version_compare(PHP_VERSION, '5.3.0') >= 0) ) { $fontreplace = array(); - $fonturl_regex = <<<'LOD' -~(?(DEFINE)(?(["']) (?>[^"'\\]++ | \\{2} | \\. | (?!\g{-1})["'] )*+ \g{-1})(? /\* .*? \*/ ) (?(?: data: ) [^"'\s)}]*+ ) (?(?> [^u}/"']++ | \g | \g | \Bu | u(?!rl\s*+\() | /(?!\*) | \g \g ["']?+ )++ ) (? \G(? url\( \s*+ ["']?+ ) ) \g (*SKIP)(*FAIL) | \g \g?+ \g \K ((?:(?:https?:)?(?://[[:alnum:]\-\.]+)(?::[0-9]+)?)?\/[^"'\s)}]*+) ~xs -LOD; - + include_once(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeFontRegex.php'); + preg_match_all($fonturl_regex,$code,$matches); if (is_array($matches)) { foreach($matches[8] as $count => $quotedurl) { diff --git a/classlesses/autoptimizeFontRegex.php b/classlesses/autoptimizeFontRegex.php new file mode 100644 index 00000000..b1cbe0f9 --- /dev/null +++ b/classlesses/autoptimizeFontRegex.php @@ -0,0 +1,9 @@ +(["']) (?>[^"'\\]++ | \\{2} | \\. | (?!\g{-1})["'] )*+ \g{-1})(? /\* .*? \*/ ) (?(?: data: ) [^"'\s)}]*+ ) (?(?> [^u}/"']++ | \g | \g | \Bu | u(?!rl\s*+\() | /(?!\*) | \g \g ["']?+ )++ ) (? \G(? url\( \s*+ ["']?+ ) ) \g (*SKIP)(*FAIL) | \g \g?+ \g \K ((?:(?:https?:)?(?://[[:alnum:]\-\.]+)(?::[0-9]+)?)?\/[^"'\s)}]*+) ~xs +LOD; + +error_log('fontregex included'); +?> \ No newline at end of file