Merge branch 'release/22.1' into trunk

admin/class-gutenberg-compatibility.php

@@ -15,14 +15,14 @@ class WPSEO_Gutenberg_Compatibility {
 	 *
 	 * @var string
 	 */
-	public const CURRENT_RELEASE = '17.6.5';
+	public const CURRENT_RELEASE = '17.6.6';
 
 	/**
 	 * The minimally supported version of Gutenberg by the plugin.
 	 *
 	 * @var string
 	 */
-	public const MINIMUM_SUPPORTED = '17.6.5';
+	public const MINIMUM_SUPPORTED = '17.6.6';
 
 	/**
 	 * Holds the current version.

package.json

@@ -81,7 +81,7 @@
     "typescript": "^4.2.4"
   },
   "yoast": {
-    "pluginVersion": "22.1-RC3"
+    "pluginVersion": "22.1-RC4"
   },
   "version": "0.0.0"
 }

readme.txt

@@ -358,6 +358,7 @@ Release date: 2024-02-20
 * Fixes a bug where ending a _How-To_ or _FAQ_ block element with a backslash would generate errors when re-opening a saved post.
 * Fixes a bug where fatal errors occurred when using a plugin that hooks into `views_edit-{$post_type}` but did not return an array as expected.
 * Fixes a bug where next and prev links in query loop would be wrong when disabling `Inherit query from template`.
+* Fixes a bug where some custom post types such as Divi layouts could be experiencing problems after activation or deactivation of Yoast SEO.
 * Fixes a bug where the `ProfilePage` schema node would not be valid when it was manually chosen for a page.
 
 #### Other

wp-seo-main.php

@@ -15,7 +15,7 @@
  * {@internal Nobody should be able to overrule the real version number as this can cause
  *            serious issues with the options, so no if ( ! defined() ).}}
  */
-define( 'WPSEO_VERSION', '22.1-RC3' );
+define( 'WPSEO_VERSION', '22.1-RC4' );
 
 
 if ( ! defined( 'WPSEO_PATH' ) ) {
@@ -226,7 +226,7 @@ function _wpseo_activate() {
 			$GLOBALS['wpseo_rewrite'] = new WPSEO_Rewrite();
 		}
 	}
-	add_action( 'shutdown', 'flush_rewrite_rules' );
+	add_action( 'shutdown', [ 'WPSEO_Utils', 'clear_rewrites' ] );
 
 	WPSEO_Options::set( 'indexing_reason', 'first_install' );
 	WPSEO_Options::set( 'first_time_install', true );
@@ -261,7 +261,7 @@ function _wpseo_activate() {
 function _wpseo_deactivate() {
 	require_once WPSEO_PATH . 'inc/wpseo-functions.php';
 
-	add_action( 'shutdown', 'flush_rewrite_rules' );
+	add_action( 'shutdown', [ 'WPSEO_Utils', 'clear_rewrites' ] );
 
 	// Register capabilities, to make sure they are cleaned up.
 	do_action( 'wpseo_register_roles' );

wp-seo.php

@@ -8,7 +8,7 @@
  *
  * @wordpress-plugin
  * Plugin Name: Yoast SEO
- * Version:     22.1-RC3
+ * Version:     22.1-RC4
  * Plugin URI:  https://yoa.st/1uj
  * Description: The first true all-in-one SEO solution for WordPress, including on-page content analysis, XML sitemaps and much more.
  * Author:      Team Yoast