Changeset 3410763

Timestamp:

12/04/2025 11:06:44 AM (10 days ago)

Author:

ignatggeorgiev

Message:

Bump to 7.7.5

Location:

sg-cachepress/trunk

Files:

• core/Combinator/Abstract_Combinator.php (modified) (1 diff)
• core/Combinator/Css_Combinator.php (modified) (3 diffs)
• core/Combinator/Js_Combinator.php (modified) (1 diff)
• core/Images_Optimizer/Images_Optimizer_Webp.php (modified) (6 diffs)
• core/Loader/Loader.php (modified) (1 diff)
• core/Supercacher/Supercacher_Helper.php (modified) (3 diffs)
• core/Supercacher/Supercacher_Posts.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• sg-cachepress.php (modified) (2 diffs)

sg-cachepress/trunk/core/Combinator/Abstract_Combinator.php

@@ -204 +204 @@
         return $file_content;
     }
+
+    /**
+     * Removes the host and query stings from an URL to get the source.
+     *
+     * @param $url The URL to prepare.
+     *
+     * @return string The URL src.
+     */
+    public function prepare_url_src( $url ) {
+        // Strips the URL from its host and query strings.
+        return trim( str_replace( Helper_Service::get_site_url(), '', strtok( $url, '?' ) ), "/\\" );
+    }
 }

sg-cachepress/trunk/core/Combinator/Css_Combinator.php

@@ -182 +182 @@
             }
 
-            // Replace the site URL and get the src.
-            $excluded[] = trim( str_replace( Helper_Service::get_site_url(), '', strtok( $wp_styles->registered[ $handle ]->src, '?' ) ), '/\\' );
+            // Remove the query stings and the host to get the source.
+            $excluded[] = $this->prepare_url_src( $wp_styles->registered[ $handle ]->src );
         }
 
@@ -208 +208 @@
         }
 
-        // Get the host from src..
+        // Get the host from src.
         $host = wp_parse_url( $style[2], PHP_URL_HOST );
 
@@ -219 +219 @@
         }
 
-        // Remove query strings from the URL.
-        $src  = Front_End_Optimization::remove_query_strings( $style[2] );
-
-        // Bail if the url is excluded.
-        if ( in_array( str_replace( trailingslashit( Helper_Service::get_site_url() ), '', $src ), $this->excluded_urls ) ) {
+        // Remove the query stings and the host to get the source.
+        $src = $this->prepare_url_src( $style[2] );
+
+        // Bail if the URL is excluded.
+        if ( in_array( $src, $this->excluded_urls ) ) {
             return true;
         }

sg-cachepress/trunk/core/Combinator/Js_Combinator.php

@@ -519 +519 @@
     public $excluded_ids = array(
         '@wordpress/block-library/navigation-js-module',
+        '@wordpress/block-library/navigation/view-js-module',
     );
 

sg-cachepress/trunk/core/Images_Optimizer/Images_Optimizer_Webp.php

@@ -119 +119 @@
 
     /**
-     * Check if image exists and perform optimiation.
+     * Check if image exists and perform optimization. 
      *
      * @since  5.0.0
@@ -128 +128 @@
      */
     public static function generate_webp_file( $filepath ) {
-        // Bail if the file doens't exists or if the webp copy already exists.
+        // Bail if the file doesn't exists or if the webp copy already exists.
         if ( ! file_exists( $filepath ) ) {
             return true;
@@ -189 +189 @@
 
     /**
-     * Delete all Webp files.
+     * Delete the webp images generated by us, and reset the optimization status.
      *
      * @since  5.4.0
@@ -196 +196 @@
      */
     public function delete_webp_files() {
-        $basedir = Helper_Service::get_uploads_dir();
-        exec( "find $basedir -name '*.webp' -type f -print0 | xargs -L 500 -0 rm", $output, $result );
+
+        $this->delete_generated_webp_copies();
 
         $this->reset_image_optimization_status();
@@ -220 +220 @@
 
         if ( ! empty( $metadata['sizes'] ) ) {
-            // Loop through all image sizes and optimize them as well.
+            // Loop through all image sizes and delete them as well.
             foreach ( $metadata['sizes'] as $size ) {
                 $wp_filesystem->delete( str_replace( $basename, $size['file'], $main_image ) . '.webp' );
             }
         }
-
     }
 
@@ -241 +240 @@
         $this->optimize( $id, $metadata );
     }
+
+
+    /**
+     * Deletes only the webp images generated by us.
+     */
+    public function delete_generated_webp_copies() {
+
+        $images_ids = $this->get_all_image_attachments_with_webp_meta();
+
+        $batch_size = 200;
+
+        $batches = array_chunk( $images_ids, $batch_size );
+
+        foreach ( $batches as $chunk ) {
+            foreach ( $chunk as $image_id ) {
+                $this->delete_webp_copy( $image_id );
+            }
+        }
+    }
+
+    /**
+     * Gets all attachments with webp meta key.
+     *
+     * @return Array with IDs of images.
+     */
+    public function get_all_image_attachments_with_webp_meta() {
+        // Query for attachments with the meta key and MIME type 'image'.
+        $image_ids = get_posts(
+            array(
+                'post_type'      => 'attachment',
+                'post_mime_type' => 'image',
+                'meta_query'     => array(
+                    array(
+                        'key'     => 'siteground_optimizer_is_converted_to_webp',
+                        'compare' => 'EXISTS',
+                    ),
+                ),
+                'fields'         => 'ids',
+                'posts_per_page' => -1,
+            )
+        );
+
+        return $image_ids;
+    }
 }

sg-cachepress/trunk/core/Loader/Loader.php

@@ -510 +510 @@
             // Minify the js files.
             add_action( 'wp_print_scripts', array( $this->minifier, 'minify_scripts' ), 20 );
-            add_action( 'wp_print_footer_scripts', array( $this->minifier, 'minify_scripts' ) );
+
+            if ( ! function_exists( 'is_plugin_active' ) ) {
+                require_once ABSPATH . 'wp-admin/includes/plugin.php';
+            }
+
+            if ( is_plugin_active( 'akismet/akismet.php' ) ) {
+                add_action( 'wp_print_footer_scripts', array( $this->minifier, 'minify_scripts' ), 9 );
+            } else {
+                add_action( 'wp_print_footer_scripts', array( $this->minifier, 'minify_scripts' ) );
+            }
         }
 

sg-cachepress/trunk/core/Supercacher/Supercacher_Helper.php

@@ -28 +28 @@
         if (
             0 === $is_cache_enabled ||
-            self::is_url_excluded( trailingslashit( $url ) )
+            self::is_url_excluded( trailingslashit( $url ) ) ||
+            self::is_query_param_excluded( $url )
         ) {
             $result->header( 'X-Cache-Enabled', 'False' );
@@ -60 +61 @@
             ( 0 === $is_cache_enabled && 0 === $file_cache_enabled ) ||
             self::is_url_excluded( $url ) ||
-            self::is_post_type_excluded( $url )
+            self::is_post_type_excluded( $url ) ||
+            self::is_query_param_excluded( $url )
         ) {
             $headers['X-Cache-Enabled'] = 'False';
@@ -163 +165 @@
     }
 
+    /**
+     * Checks if the URL contains excluded query parameters.
+     *
+     * @param $url The URL to check.
+     *
+     * @return boolean True if the URL contains excluded parameters, false otherwise.
+     */
+    public static function is_query_param_excluded( $url ) {
+        // Get the excluded parameters, if there are such.
+        $excluded_params = apply_filters( 'sgo_bypass_query_params', array() );
+
+        if ( empty( $excluded_params ) ) {
+            return false;
+        }
+
+        // Get the query parameters.
+        $parsed_params = wp_parse_url( $url, PHP_URL_QUERY );
+
+        if ( empty( $parsed_params ) ) {
+            return false;
+        }
+
+        // Convert the parameters into array.
+        $query_params = array();
+        parse_str( $parsed_params, $query_params );
+
+        // Check if excluded parameters, exist in the query string.
+        foreach ( $excluded_params as $param ) {
+            if ( array_key_exists( $param, $query_params ) ) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
 }

sg-cachepress/trunk/core/Supercacher/Supercacher_Posts.php

@@ -137 +137 @@
     public function purge_all_post_cache( $post_id ) {
 
+        // Get the post.
+        $post = get_post( $post_id );
+
+        // Bail if the current hook is save_post and the post is scheduled.
+        if ( 'save_post' === current_action() && 'future' === get_post_status( $post_id ) ) {
+            return;
+        }
+
+        // Bail if the current hook is publish_post and the post isn't scheduled.
+        if ( 'publish_post' === current_action() && 'future' !== get_post_status( $post_id ) ) {
+            return;
+        }
+
+        // Bail if post type is excluded from cache purge.
+        if ( true === $this->is_post_excluded_from_cache_purge( $post ) ) {
+            return;
+        }
+
         // Check if the cache for that $post_id is already flushed.
         if ( true === $this->is_post_cache_already_flushed( $post_id ) ) {
-            return;
-        }
-
-        // Get the post.
-        $post = get_post( $post_id );
-
-        // Bail if the current hook is save_post and the post is scheduled.
-        if ( 'save_post' === current_action() && 'future' === get_post_status( $post_id ) ) {
-            return;
-        }
-
-        // Bail if the current hook is publish_post and the post isn't scheduled.
-        if ( 'publish_post' === current_action() && 'future' !== get_post_status( $post_id ) ) {
-            return;
-        }
-
-        // Bail if post type is excluded from cache purge.
-        if ( true === $this->is_post_excluded_from_cache_purge( $post ) ) {
             return;
         }

sg-cachepress/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.7
 Requires PHP: 7.0
-Tested up to: 6.8
-Stable tag: 7.7.4
+Tested up to: 6.9
+Stable tag: 7.7.5
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -119 +119 @@
 == Changelog ==
 
+= Version 7.7.5 =
+Release Date: Dec 4th, 2025
+
+* JS Combinator improvements
+* Dynamic cache purge improvements
+* CSS combination improvements
+* WebP deletion improvements
+* Query string exclude support for Dynamic Cache
+
+
 = Version 7.7.4 =
 Release Date: Nov 11th, 2025

sg-cachepress/trunk/sg-cachepress.php

@@ -11 +11 @@
  * Plugin URI:        https://siteground.com
  * Description:       This plugin will link your WordPress application with all the performance optimizations provided by SiteGround
- * Version:           7.7.4
+ * Version:           7.7.5
  * Author:            SiteGround
  * Author URI:        https://www.siteground.com
@@ -34 +34 @@
 // Define version constant.
 if ( ! defined( __NAMESPACE__ . '\VERSION' ) ) {
-    define( __NAMESPACE__ . '\VERSION', '7.7.4' );
+    define( __NAMESPACE__ . '\VERSION', '7.7.5' );
 }