Changeset 2225271

Timestamp:

01/10/2020 08:55:40 AM (6 years ago)

Author:

alaca

Message:

Update 1.1.7.4

Location:

wp-performance/trunk

Files:

• includes/classes/parser.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)
• wp-performance.php (modified) (2 diffs)

wp-performance/trunk/includes/classes/parser.php

@@ -718 +718 @@
 
             foreach ( $combined_css as $link ) {
-                $linksMedia[] = $link[ 'media' ];    
+                $linksMedia[ $link[ 'href' ] ] = $link[ 'media' ];    
             }     
 
             foreach ( array_unique( $linksMedia ) as $media ) {
 
-                $filename = md5( $media ) . '.css';
-
-                if ( file_exists( WPP_CACHE_DIR . $filename ) ) continue;   
-
-                $code = '';
-
-                foreach ( $combined_css as $link ) {
-
-                    if ( $link[ 'media' ] == $media ) {
-
-                        $originalCode = File::get( File::path( $link[ 'href' ] ) );  
-
-                        if (
-                            Option::get( 'css_minify' ) 
-                            && wpp_in_array( array_keys( Option::get( 'css_minify' ) ), $link[ 'href' ] )
-                        ) {
-                            $code .= Minify::code( $originalCode, $link[ 'href' ] ); 
-                        } else {
-                            $code .= Minify::replacePaths( $originalCode, $link[ 'href' ] );
+                $filename = md5( $media . serialize( $linksMedia ) ) . '.css';
+
+                if ( ! file_exists( WPP_CACHE_DIR . $filename ) )  {
+
+                    $code = '';
+
+                    foreach ( $combined_css as $link ) {
+    
+                        if ( $link[ 'media' ] == $media ) {
+    
+                            $originalCode = File::get( File::path( $link[ 'href' ] ) );  
+    
+                            if (
+                                Option::get( 'css_minify' ) 
+                                && wpp_in_array( array_keys( Option::get( 'css_minify' ) ), $link[ 'href' ] )
+                            ) {
+                                $code .= Minify::code( $originalCode, $link[ 'href' ] ); 
+                            } else {
+                                $code .= Minify::replacePaths( $originalCode, $link[ 'href' ] );
+                            }
+                            
                         }
-                        
-                    }
-                }      
-                
-                File::save( WPP_CACHE_DIR . $filename, $code );
+                    }      
+                    
+                    File::save( WPP_CACHE_DIR . $filename, $code );
+
+                }
 
                 //touch( WPP_CACHE_DIR . $filename, time() - 3600 );
@@ -825 +827 @@
     
                 File::save( WPP_CACHE_DIR . $filename, $code );
-    
-                // CDN?
-                $url = ( Option::get( 'cdn' ) && Option::get( 'cdn_hostname' ) ) 
-                     ? str_replace( site_url(), Option::get( 'cdn_hostname' ), WPP_CACHE_URL )
-                     : WPP_CACHE_URL;
-    
-                // Defer js
-                if ( Option::boolval( 'js_defer' ) ) {
-                    $this->body->innertext .= '<script type="text/wppscript" data-src="' . $url . $filename . '"></script>' . PHP_EOL;
-                } else {
-                    $this->body->innertext .= '<script src="' . $url . $filename . '"></script>' . PHP_EOL;
-                }
-
+
+            }
+    
+            // CDN?
+            $url = ( Option::get( 'cdn' ) && Option::get( 'cdn_hostname' ) ) 
+                    ? str_replace( site_url(), Option::get( 'cdn_hostname' ), WPP_CACHE_URL )
+                    : WPP_CACHE_URL;
+
+            // Defer js
+            if ( Option::boolval( 'js_defer' ) ) {
+                $this->body->innertext .= '<script type="text/wppscript" data-src="' . $url . $filename . '"></script>' . PHP_EOL;
+            } else {
+                $this->body->innertext .= '<script src="' . $url . $filename . '"></script>' . PHP_EOL;
             }
 

wp-performance/trunk/readme.txt

@@ -11 +11 @@
 
 == Changelog ==
+
+= 1.1.7.4 =
+[FIX] Combine CSS
+[FIX] Combine JS
 
 = 1.1.7.3 =

wp-performance/trunk/wp-performance.php

@@ -4 +4 @@
 * Plugin URI: https://www.wp-performance.com
 * Description: WP Performance Optimizer
-* Version: 1.1.7.3
+* Version: 1.1.7.4
 * Author: Ante Laca
 * Author URI: https://www.antelaca.xyz
@@ -15 +15 @@
 
 // WP Performance
-define( 'WPP_VERSION'       , '1.1.7.3' );
+define( 'WPP_VERSION'       , '1.1.7.4' );
 define( 'WPP_SELF'          , __FILE__ );
 define( 'WPP_URI'           , plugin_dir_url( __FILE__ ) );