Release 3.15.6 (PR #6306)

inc/Engine/Optimization/Minify/AbstractMinifySubscriber.php

@@ -128,6 +128,6 @@ public function i18n_multidomain_url( $url ) {
 			return $url;
 		}
 
-		return str_replace( $url_host, sanitize_text_field( $_SERVER['HTTP_HOST'] ), $url ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash
+		return preg_replace( '/' . preg_quote( $url_host, '/' ) . '/', sanitize_text_field( $_SERVER['HTTP_HOST'] ), $url, 1 ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash
 	}
 }

inc/Engine/Optimization/RUCSS/Admin/Settings.php

@@ -366,6 +366,7 @@ public function add_localize_script_data( $data ): array {
 		}
 
 		$data['notice_end_time'] = $transient;
+		$data['cron_disabled']   = rocket_get_constant( 'DISABLE_WP_CRON', false );
 
 		return $data;
 	}

inc/Engine/Optimization/RUCSS/Admin/Subscriber.php

@@ -606,6 +606,10 @@ private function set_notice_transient() {
 	 * @return void
 	 */
 	public function spawn_cron() {
+		if ( rocket_get_constant( 'DISABLE_WP_CRON', false ) ) {
+			return;// Bailout and don't fire the CRON.
+		}
+
 		check_ajax_referer( 'rocket-ajax', 'nonce' );
 
 		if ( ! current_user_can( 'rocket_manage_options' ) ) {

inc/Engine/Optimization/RUCSS/Strategy/Strategies/DefaultProcess.php

@@ -34,15 +34,15 @@ class DefaultProcess implements StrategyInterface {
 		2 => 300,  // 5 minutes
 		3 => 600,  // 10 minutes.
 		4 => 1200, // 20 minutes.
-		5 => 1800, // 30 minutes.
+		5 => 1500, // 25 minutes.
 	];
 
 	/**
 	 * Default value to wait before a retry.
 	 *
 	 * @var int
 	 */
-	private $default_waiting_retry = 1800;
+	private $default_waiting_retry = 1500;
 
 	/**
 	 * Strategy Constructor.

inc/Plugin.php

@@ -381,6 +381,7 @@ private function init_common_subscribers() {
 			'lazyload_css_subscriber',
 			'shoptimizer',
 			'weglot',
+			'contactform7',
 		];
 
 		$host_type = HostResolver::get_host_service();

inc/ThirdParty/Plugins/ContactForm7.php

@@ -0,0 +1,61 @@
+<?php
+namespace WP_Rocket\ThirdParty\Plugins;
+
+use WP_Rocket\Event_Management\Subscriber_Interface;
+
+class ContactForm7 implements Subscriber_Interface {
+
+	/**
+	 * Required CF6 version.
+	 *
+	 * Version in which the wpcf7_shortcode_callback action was introduced.
+	 *
+	 * @var string
+	 */
+	const REQUIRED_CF7_VERSION = '5.8.1';
+
+	/**
+	 * Subscribed events.
+	 */
+	public static function get_subscribed_events() {
+		return [
+			'template_redirect' => [ 'maybe_optimize_contact_form_7', 10 ],
+		];
+	}
+
+	/**
+	 * Optimize ContactForm7 scripts.
+	 */
+	public function maybe_optimize_contact_form_7() {
+		// The wpcf7_shortcode_callback action was added in CF7 version 5.8.1.
+		if ( ! defined( 'WPCF7_VERSION' ) || version_compare( WPCF7_VERSION, self::REQUIRED_CF7_VERSION, '<' ) ) {
+			return;
+		}
+
+		// Force scripts and styles to not load by default.
+		add_filter( 'wpcf7_load_js', '__return_false', PHP_INT_MAX );
+		add_filter( 'wpcf7_load_css', '__return_false', PHP_INT_MAX );
+
+		// Conditionally enqueue scripts.
+		add_action( 'wpcf7_shortcode_callback', [ $this, 'conditionally_enqueue_scripts' ] );
+		add_action( 'wpcf7_shortcode_callback',  [ $this, 'conditionally_enqueue_styles' ] );
+	}
+
+	/**
+	 * Enqueue scripts if not already enqueued.
+	 */
+	public function conditionally_enqueue_scripts() {
+		if ( ! did_action( 'wpcf7_enqueue_scripts' ) ) { // Prevent double-enqueueing when multiple forms present.
+			wpcf7_enqueue_scripts();
+		}
+	}
+
+	/**
+	 * Enqueue styles if not already enqueued.
+	 */
+	public function conditionally_enqueue_styles() {
+		if ( ! did_action( 'wpcf7_enqueue_styles' ) ) { // Prevent double-enqueueing when multiple forms present.
+			wpcf7_enqueue_styles();
+		}
+	}
+}

inc/ThirdParty/ServiceProvider.php

@@ -36,6 +36,7 @@
 use WP_Rocket\ThirdParty\Plugins\CDN\{Cloudflare, CloudflareFacade};
 use WP_Rocket\ThirdParty\Plugins\Jetpack;
 use WP_Rocket\ThirdParty\Plugins\WPGeotargeting;
+use WP_Rocket\ThirdParty\Plugins\ContactForm7;
 use WP_Rocket\ThirdParty\Plugins\SEO\RankMathSEO;
 use WP_Rocket\ThirdParty\Plugins\SEO\AllInOneSEOPack;
 use WP_Rocket\ThirdParty\Plugins\SEO\SEOPress;
@@ -103,6 +104,7 @@ class ServiceProvider extends AbstractServiceProvider {
 		'translatepress',
 		'wpgeotargeting',
 		'weglot',
+		'contactform7',
 	];
 
 	/**
@@ -261,5 +263,6 @@ public function register() {
 			->share( 'weglot', Weglot::class );
 		$this->getContainer()->share( 'translatepress', TranslatePress::class );
 		$this->getContainer()->share( 'wpgeotargeting', WPGeotargeting::class );
+		$this->getContainer()->share( 'contactform7', ContactForm7::class );
 	}
 }

languages/rocket-de_DE.po

@@ -4,16 +4,16 @@
 # Caspar Hübinger, 2020
 # Rico Michael <[email protected]>, 2021
 # Ben_Mew <[email protected]>, 2023
-# Romain • WP Rocket <[email protected]>, 2023
 # Christian Herrmann, 2023
+# Romain • WP Rocket <[email protected]>, 2023
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: WP Rocket 3.15.1-alpha1\n"
 "Report-Msgid-Bugs-To: http://wp-rocket.me/\n"
 "POT-Creation-Date: 2023-09-25T14:39:29+03:00\n"
 "PO-Revision-Date: 2019-08-26 15:14+0000\n"
-"Last-Translator: Christian Herrmann, 2023\n"
+"Last-Translator: Romain • WP Rocket <[email protected]>, 2023\n"
 "Language-Team: German (Germany) (https://app.transifex.com/wp-media/teams/18133/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -557,9 +557,8 @@ msgid ""
 "https://docs.wp-rocket.me/article/626-how-to-make-system-files-htaccess-wp-"
 "config-writeable/?utm_source=wp_plugin&utm_medium=wp_rocket"
 msgstr ""
-"https://de.docs.wp-rocket.me/article/1042-fehlende-schreibrechte-fuer-"
-"system-dateien-beheben-htaccess-wp-"
-"configphp?utm_source=wp_plugin&utm_medium=wp_rocket"
+"https://docs.wp-rocket.me/article/626-how-to-make-system-files-htaccess-wp-"
+"config-writeable/?utm_source=wp_plugin&utm_medium=wp_rocket"
 
 #: inc/admin/ui/notices.php:311
 msgid ""