Merge branch 'trunk' into develop

wp-media · Feb 11, 2025 · b3c6752 · b3c6752
2 parents 11744a1 + 80eb913
commit b3c6752
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/dynamic-lists-delayjs.json b/dynamic-lists-delayjs.json
diff --git a/inc/Engine/Cache/TaxonomySubscriber.php b/inc/Engine/Cache/TaxonomySubscriber.php
@@ -69,6 +69,12 @@ private function is_not_valid_taxonomy_page() {
 			$term_link = trailingslashit( $term_link ) . 'page/' . get_query_var( 'paged' );
 		}
 
-		return urldecode( untrailingslashit( $term_link ) ) !== urldecode( untrailingslashit( $current_link ) );
+		$term_link = urldecode( untrailingslashit( $term_link ) );
+
+		if ( urldecode( untrailingslashit( $current_link ) ) !== $term_link && ! empty( $_SERVER['REQUEST_URI'] ) ) {
+			$current_link = home_url( add_query_arg( [], wp_unslash( $_SERVER['REQUEST_URI'] ) ) );// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+		}
+
+		return urldecode( untrailingslashit( $current_link ) ) !== $term_link;
 	}
 }
diff --git a/inc/Engine/Common/PerformanceHints/Frontend/Subscriber.php b/inc/Engine/Common/PerformanceHints/Frontend/Subscriber.php
@@ -54,7 +54,7 @@ public static function get_subscribed_events(): array {
 	 * @return string
 	 */
 	public function maybe_apply_optimizations( $html ): string {
-		if ( ! isset( $_GET['wpr_imagedimensions'] ) && isset( $_GET['wpr_lazyrendercontent'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		if ( empty( $html ) || ( ! isset( $_GET['wpr_imagedimensions'] ) && isset( $_GET['wpr_lazyrendercontent'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			return $html;
 		}
 

diff --git a/wp-rocket.php b/wp-rocket.php
@@ -3,7 +3,7 @@
  * Plugin Name: WP Rocket
  * Plugin URI: https://wp-rocket.me
  * Description: The best WordPress performance plugin.
- * Version: 3.18.1.4
+ * Version: 3.18.1.5
  * Requires at least: 5.8
  * Requires PHP: 7.3
  * Code Name: Iego
@@ -20,7 +20,7 @@
 defined( 'ABSPATH' ) || exit;
 
 // Rocket defines.
-define( 'WP_ROCKET_VERSION',               '3.18.1.4' );
+define( 'WP_ROCKET_VERSION',               '3.18.1.5' );
 define( 'WP_ROCKET_WP_VERSION',            '5.8' );
 define( 'WP_ROCKET_WP_VERSION_TESTED',     '6.3.1' );
 define( 'WP_ROCKET_PHP_VERSION',           '7.3' );