Merge branch 'release/23.8' into trunk

admin/class-gutenberg-compatibility.php

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

admin/metabox/class-metabox.php

@@ -74,12 +74,7 @@ public function __construct() {
 		}
 
 		add_action( 'add_meta_boxes', [ $this, 'add_meta_box' ] );
-		// Enqueue metabox assets for the block editor.
-		add_action( 'enqueue_block_assets', [ $this, 'enqueue' ] );
-		// Enqueue metabox assets for other editors.
-		add_action( 'admin_enqueue_scripts', [ $this, 'maybe_enqueue_assets_non_block_editor' ] );
-
-		add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_post_overview_assets' ] );
+		add_action( 'admin_enqueue_scripts', [ $this, 'enqueue' ] );
 		add_action( 'wp_insert_post', [ $this, 'save_postdata' ] );
 		add_action( 'edit_attachment', [ $this, 'save_postdata' ] );
 		add_action( 'add_attachment', [ $this, 'save_postdata' ] );
@@ -804,51 +799,31 @@ public function is_meta_value_disabled( $key ) {
 	}
 
 	/**
-	 * Enqueues assets for the post overview page.
+	 * Enqueues all the needed JS and CSS.
+	 *
+	 * @todo [JRF => whomever] Create css/metabox-mp6.css file and add it to the below allowed colors array when done.
 	 *
 	 * @return void
 	 */
-	public function enqueue_post_overview_assets() {
+	public function enqueue() {
 		global $pagenow;
 
 		$asset_manager = new WPSEO_Admin_Asset_Manager();
 
+		$is_editor = self::is_post_overview( $pagenow ) || self::is_post_edit( $pagenow );
+
 		if ( self::is_post_overview( $pagenow ) ) {
 			$asset_manager->enqueue_style( 'edit-page' );
 			$asset_manager->enqueue_script( 'edit-page' );
-		}
-	}
-
-	/**
-	 * Checks to make sure the current editor used is not the block editor to enqueue all needed assets.
-	 * If it is the block editor the assets are already enqueued in the `enqueue_block_assets` action.
-	 *
-	 * @return void
-	 */
-	public function maybe_enqueue_assets_non_block_editor() {
-		global $pagenow;
 
-		if ( ( self::is_post_edit( $pagenow ) === false && apply_filters( 'wpseo_always_register_metaboxes_on_admin', false ) === false ) || WP_Screen::get()->is_block_editor() ) {
 			return;
 		}
 
-		$this->enqueue();
-	}
-
-	/**
-	 * Enqueues all the needed JS and CSS.
-	 *
-	 * @todo [JRF => whomever] Create css/metabox-mp6.css file and add it to the below allowed colors array when done.
-	 *
-	 * @return void
-	 */
-	public function enqueue() {
-		if ( $this->display_metabox() === false ) {
+		/* Filter 'wpseo_always_register_metaboxes_on_admin' documented in wpseo-main.php */
+		if ( ( $is_editor === false && apply_filters( 'wpseo_always_register_metaboxes_on_admin', false ) === false ) || $this->display_metabox() === false ) {
 			return;
 		}
 
-		$asset_manager = new WPSEO_Admin_Asset_Manager();
-
 		$post_id = get_queried_object_id();
 		// phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Reason: We are not processing form information.
 		if ( empty( $post_id ) && isset( $_GET['post'] ) && is_string( $_GET['post'] ) ) {

package.json

@@ -76,7 +76,7 @@
     "webpack-bundle-analyzer": "^4.9.1"
   },
   "yoast": {
-    "pluginVersion": "23.8-RC2"
+    "pluginVersion": "23.8-RC3"
   },
   "version": "0.0.0"
 }

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', '23.8-RC2' );
+define( 'WPSEO_VERSION', '23.8-RC3' );
 
 
 if ( ! defined( 'WPSEO_PATH' ) ) {

wp-seo.php

@@ -8,7 +8,7 @@
  *
  * @wordpress-plugin
  * Plugin Name: Yoast SEO
- * Version:     23.8-RC2
+ * Version:     23.8-RC3
  * 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