@@ -66,11 +66,11 @@ |
||
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - // revslider data attribs somehow suffer from HTML optimization, this fixes that |
|
| 69 | + // revslider data attribs somehow suffer from HTML optimization, this fixes that |
|
| 70 | 70 | if ( class_exists('RevSlider') || apply_filters('autoptimize_filter_html_dataattrib_cleanup', false) ) { |
| 71 | - $this->content = preg_replace('#\n(data-.*$)\n#Um',' $1 ', $this->content); |
|
| 72 | - $this->content = preg_replace('#(=\"[^"]*\")(\w)#','$1 $2', $this->content); |
|
| 73 | - } |
|
| 71 | + $this->content = preg_replace('#\n(data-.*$)\n#Um',' $1 ', $this->content); |
|
| 72 | + $this->content = preg_replace('#(=\"[^"]*\")(\w)#','$1 $2', $this->content); |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | 75 | return true; |
| 76 | 76 | } |
@@ -162,32 +162,32 @@ discard block |
||
| 162 | 162 | // Remove the original style tag |
| 163 | 163 | $this->content = str_replace($tag,'',$this->content); |
| 164 | 164 | } else {
|
| 165 | - // excluded CSS, minify if getpath |
|
| 166 | - if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
|
|
| 167 | - $explUrl = explode('?',$source[2],2);
|
|
| 165 | + // excluded CSS, minify if getpath |
|
| 166 | + if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
|
|
| 167 | + $explUrl = explode('?',$source[2],2);
|
|
| 168 | 168 | $url = $explUrl[0]; |
| 169 | 169 | $path = $this->getpath($url); |
| 170 | 170 | |
| 171 | - if ($path && apply_filters('autoptimize_filter_css_minify_excluded',false)) {
|
|
| 172 | - $_CachedMinifiedUrl = $this->minify_single($path); |
|
| 173 | - |
|
| 174 | - if (!empty($_CachedMinifiedUrl)) {
|
|
| 175 | - // replace orig URL with URL to cache |
|
| 176 | - $newTag = str_replace($url, $_CachedMinifiedUrl, $tag); |
|
| 177 | - } else {
|
|
| 178 | - $newTag = $tag; |
|
| 179 | - } |
|
| 171 | + if ($path && apply_filters('autoptimize_filter_css_minify_excluded',false)) {
|
|
| 172 | + $_CachedMinifiedUrl = $this->minify_single($path); |
|
| 173 | + |
|
| 174 | + if (!empty($_CachedMinifiedUrl)) {
|
|
| 175 | + // replace orig URL with URL to cache |
|
| 176 | + $newTag = str_replace($url, $_CachedMinifiedUrl, $tag); |
|
| 177 | + } else {
|
|
| 178 | + $newTag = $tag; |
|
| 179 | + } |
|
| 180 | 180 | |
| 181 | - // remove querystring from URL |
|
| 182 | - if ( !empty($explUrl[1]) ) {
|
|
| 183 | - $newTag = str_replace("?".$explUrl[1],"",$newTag);
|
|
| 184 | - } |
|
| 185 | - |
|
| 186 | - // and replace |
|
| 187 | - $this->content = str_replace($tag,$newTag,$this->content); |
|
| 188 | - } |
|
| 189 | - } |
|
| 190 | - } |
|
| 181 | + // remove querystring from URL |
|
| 182 | + if ( !empty($explUrl[1]) ) {
|
|
| 183 | + $newTag = str_replace("?".$explUrl[1],"",$newTag);
|
|
| 184 | + } |
|
| 185 | + |
|
| 186 | + // and replace |
|
| 187 | + $this->content = str_replace($tag,$newTag,$this->content); |
|
| 188 | + } |
|
| 189 | + } |
|
| 190 | + } |
|
| 191 | 191 | } |
| 192 | 192 | return true; |
| 193 | 193 | } |
@@ -404,7 +404,7 @@ discard block |
||
| 404 | 404 | // just cdn the URL if applicable |
| 405 | 405 | if (!empty($this->cdn_url)) {
|
| 406 | 406 | $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]); |
| 407 | - } |
|
| 407 | + } |
|
| 408 | 408 | } |
| 409 | 409 | } |
| 410 | 410 | } else if ((is_array($matches)) && (!empty($this->cdn_url))) {
|
@@ -611,8 +611,8 @@ discard block |
||
| 611 | 611 | } |
| 612 | 612 | |
| 613 | 613 | private function ismovable($tag) {
|
| 614 | - if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {
|
|
| 615 | - return false; |
|
| 614 | + if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {
|
|
| 615 | + return false; |
|
| 616 | 616 | } else if (!empty($this->whitelist)) {
|
| 617 | 617 | foreach ($this->whitelist as $match) {
|
| 618 | 618 | if(strpos($tag,$match)!==false) {
|
@@ -637,13 +637,13 @@ discard block |
||
| 637 | 637 | } |
| 638 | 638 | |
| 639 | 639 | private function can_inject_late($cssPath,$css) {
|
| 640 | - $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);
|
|
| 640 | + $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);
|
|
| 641 | 641 | if ( $this->inject_min_late !== true ) {
|
| 642 | 642 | // late-inject turned off |
| 643 | 643 | return false; |
| 644 | 644 | } else if ( (strpos($cssPath,"min.css") === false) && ( str_replace($consider_minified_array, '', $cssPath) === $cssPath ) ) {
|
| 645 | - // file not minified based on filename & filter |
|
| 646 | - return false; |
|
| 645 | + // file not minified based on filename & filter |
|
| 646 | + return false; |
|
| 647 | 647 | } else if ( strpos($css,"@import") !== false ) {
|
| 648 | 648 | // can't late-inject files with imports as those need to be aggregated |
| 649 | 649 | return false; |
@@ -88,8 +88,8 @@ |
||
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | function ao_css_snippet_filestartremover($cssin) { |
| 91 | - // speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating need to be removed |
|
| 92 | - return str_replace(array('/*FILESTART*/','/*FILESTART2*/'),'',$cssin); |
|
| 91 | + // speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating need to be removed |
|
| 92 | + return str_replace(array('/*FILESTART*/','/*FILESTART2*/'),'',$cssin); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | add_filter('autoptimize_css_individual_style','ao_css_snippetcache',10,2); |