Merge branch 'release/23.9'

admin/class-admin-init.php

@@ -250,7 +250,7 @@ private function register_premium_upsell_admin_block() {
 	 * @return void
 	 */
 	private function load_xml_sitemaps_admin() {
-		if ( WPSEO_Options::get( 'enable_xml_sitemap', false ) ) {
+		if ( WPSEO_Options::get( 'enable_xml_sitemap', false, [ 'wpseo' ] ) ) {
 			new WPSEO_Sitemaps_Admin();
 		}
 	}

admin/class-admin.php

@@ -43,15 +43,11 @@ public function __construct() {
 			WPSEO_Options::maybe_set_multisite_defaults( false );
 		}
 
-		if ( WPSEO_Options::get( 'stripcategorybase' ) === true ) {
-			add_action( 'created_category', [ $this, 'schedule_rewrite_flush' ] );
-			add_action( 'edited_category', [ $this, 'schedule_rewrite_flush' ] );
-			add_action( 'delete_category', [ $this, 'schedule_rewrite_flush' ] );
-		}
+		add_action( 'created_category', [ $this, 'schedule_rewrite_flush' ] );
+		add_action( 'edited_category', [ $this, 'schedule_rewrite_flush' ] );
+		add_action( 'delete_category', [ $this, 'schedule_rewrite_flush' ] );
 
-		if ( WPSEO_Options::get( 'disable-attachment' ) === true ) {
-			add_filter( 'wpseo_accessible_post_types', [ 'WPSEO_Post_Type', 'filter_attachment_post_type' ] );
-		}
+		add_filter( 'wpseo_accessible_post_types', [ 'WPSEO_Post_Type', 'filter_attachment_post_type' ] );
 
 		add_filter( 'plugin_action_links_' . WPSEO_BASENAME, [ $this, 'add_action_link' ], 10, 2 );
 		add_filter( 'network_admin_plugin_action_links_' . WPSEO_BASENAME, [ $this, 'add_action_link' ], 10, 2 );
@@ -75,8 +71,6 @@ public function __construct() {
 			add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_assets' ] );
 		}
 
-		$this->set_upsell_notice();
-
 		$this->initialize_cornerstone_content();
 
 		if ( WPSEO_Utils::is_plugin_network_active() ) {
@@ -119,6 +113,10 @@ public function __construct() {
 	 * @return void
 	 */
 	public function schedule_rewrite_flush() {
+		if ( WPSEO_Options::get( 'stripcategorybase' ) !== true ) {
+			return;
+		}
+
 		// Bail if this is a multisite installation and the site has been switched.
 		if ( is_multisite() && ms_is_switched() ) {
 			return;
@@ -367,17 +365,6 @@ private function localize_admin_global_script() {
 		);
 	}
 
-	/**
-	 * Sets the upsell notice.
-	 *
-	 * @return void
-	 */
-	protected function set_upsell_notice() {
-		$upsell = new WPSEO_Product_Upsell_Notice();
-		$upsell->dismiss_notice_listener();
-		$upsell->initialize();
-	}
-
 	/**
 	 * Whether we are on the admin dashboard page.
 	 *

admin/class-gutenberg-compatibility.php

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

admin/filters/class-abstract-post-filter.php

@@ -61,7 +61,7 @@ public function register_hooks() {
 			add_action( 'restrict_manage_posts', [ $this, 'render_hidden_input' ] );
 		}
 
-		if ( $this->is_filter_active() && $this->get_explanation() !== null ) {
+		if ( $this->is_filter_active() ) {
 			add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_explanation_assets' ] );
 		}
 	}
@@ -83,13 +83,19 @@ public function add_filter_links() {
 	 * @return void
 	 */
 	public function enqueue_explanation_assets() {
+		$explanation = $this->get_explanation();
+
+		if ( $explanation === null ) {
+			return;
+		}
+
 		$asset_manager = new WPSEO_Admin_Asset_Manager();
 		$asset_manager->enqueue_script( 'filter-explanation' );
 		$asset_manager->enqueue_style( 'filter-explanation' );
 		$asset_manager->localize_script(
 			'filter-explanation',
 			'yoastFilterExplanation',
-			[ 'text' => $this->get_explanation() ]
+			[ 'text' => $explanation ]
 		);
 	}
 

admin/metabox/class-metabox.php

@@ -82,8 +82,8 @@ public function __construct() {
 		$this->editor = new WPSEO_Metabox_Editor();
 		$this->editor->register_hooks();
 
-		$this->social_is_enabled            = WPSEO_Options::get( 'opengraph', false ) || WPSEO_Options::get( 'twitter', false );
-		$this->is_advanced_metadata_enabled = WPSEO_Capability_Utils::current_user_can( 'wpseo_edit_advanced_metadata' ) || WPSEO_Options::get( 'disableadvanced_meta' ) === false;
+		$this->social_is_enabled            = WPSEO_Options::get( 'opengraph', false, [ 'wpseo_social' ] ) || WPSEO_Options::get( 'twitter', false, [ 'wpseo_social' ] );
+		$this->is_advanced_metadata_enabled = WPSEO_Capability_Utils::current_user_can( 'wpseo_edit_advanced_metadata' ) || WPSEO_Options::get( 'disableadvanced_meta', null, [ 'wpseo' ] ) === false;
 
 		$this->seo_analysis                = new WPSEO_Metabox_Analysis_SEO();
 		$this->readability_analysis        = new WPSEO_Metabox_Analysis_Readability();

admin/views/partial-notifications-errors.php

@@ -21,8 +21,8 @@
 $yoast_seo_i18n_issues             = __( 'We have detected the following issues that affect the SEO of your site.', 'wordpress-seo' );
 $yoast_seo_i18n_no_issues          = __( 'Good job! We could detect no serious SEO problems.', 'wordpress-seo' );
 $yoast_seo_i18n_muted_issues_title = sprintf(
-	/* translators: %d expands the amount of hidden problems. */
-	_n( 'You have %d hidden problem:', 'You have %d hidden problems:', $yoast_seo_dismissed_total, 'wordpress-seo' ),
+	/* translators: %d expands the amount of hidden notifications. */
+	_n( 'You have %d hidden notification:', 'You have %d hidden notifications:', $yoast_seo_dismissed_total, 'wordpress-seo' ),
 	$yoast_seo_dismissed_total
 );
 

css/src/modal.css

@@ -498,11 +498,6 @@
 	position: relative;
 }
 
-#yoast-semrush-country-selector {
-	position: relative;
-	border: none;
-}
-
 .yoast-related-keyphrases-modal__chart {
 	display: block;
 }

css/src/tailwind.css

@@ -1,4 +1,5 @@
 @import "@yoast/ui-library";
+@import "@yoast/related-keyphrase-suggestions";
 
 @tailwind base;
 @tailwind components;

inc/class-post-type.php

@@ -51,7 +51,9 @@ public static function is_post_type_indexable( $post_type_name ) {
 	 * @return array The filtered array.
 	 */
 	public static function filter_attachment_post_type( array $post_types ) {
-		unset( $post_types['attachment'] );
+		if ( WPSEO_Options::get( 'disable-attachment' ) === true ) {
+			unset( $post_types['attachment'] );
+		}
 
 		return $post_types;
 	}

inc/class-rewrite.php

@@ -17,7 +17,7 @@ public function __construct() {
 		add_filter( 'query_vars', [ $this, 'query_vars' ] );
 		add_filter( 'term_link', [ $this, 'no_category_base' ], 10, 3 );
 		add_filter( 'request', [ $this, 'request' ] );
-		add_filter( 'category_rewrite_rules', [ $this, 'category_rewrite_rules' ] );
+		add_filter( 'category_rewrite_rules', [ $this, 'category_rewrite_rules_wrapper' ] );
 
 		add_action( 'created_category', [ $this, 'schedule_flush' ] );
 		add_action( 'edited_category', [ $this, 'schedule_flush' ] );
@@ -32,7 +32,9 @@ public function __construct() {
 	 * @return void
 	 */
 	public function schedule_flush() {
-		add_action( 'shutdown', 'flush_rewrite_rules' );
+		if ( WPSEO_Options::get( 'stripcategorybase' ) === true ) {
+			add_action( 'shutdown', 'flush_rewrite_rules' );
+		}
 	}
 
 	/**
@@ -45,6 +47,10 @@ public function schedule_flush() {
 	 * @return string
 	 */
 	public function no_category_base( $link, $term, $taxonomy ) {
+		if ( WPSEO_Options::get( 'stripcategorybase' ) !== true ) {
+			return $link;
+		}
+
 		if ( $taxonomy !== 'category' ) {
 			return $link;
 		}
@@ -91,6 +97,10 @@ public function query_vars( $query_vars ) {
 	 * @return array<string> The query vars.
 	 */
 	public function request( $query_vars ) {
+		if ( WPSEO_Options::get( 'stripcategorybase' ) !== true ) {
+			return $query_vars;
+		}
+
 		if ( ! isset( $query_vars['wpseo_category_redirect'] ) ) {
 			return $query_vars;
 		}
@@ -99,6 +109,21 @@ public function request( $query_vars ) {
 		return [];
 	}
 
+	/**
+	 * Wrapper for the category_rewrite_rules() below, so we can add the $rules param in a BC way.
+	 *
+	 * @param array<string> $rules Rewrite rules generated for the current permastruct, keyed by their regex pattern.
+	 *
+	 * @return array<string> The category rewrite rules.
+	 */
+	public function category_rewrite_rules_wrapper( $rules ) {
+		if ( WPSEO_Options::get( 'stripcategorybase' ) !== true ) {
+			return $rules;
+		}
+
+		return $this->category_rewrite_rules();
+	}
+
 	/**
 	 * This function taken and only slightly adapted from WP No Category Base plugin by Saurabh Gupta.
 	 *

inc/class-upgrade.php

@@ -103,10 +103,6 @@ public function __construct() {
 			add_action( 'init', [ $this, 'upgrade_125' ] );
 		}
 
-		// Since 3.7.
-		$upsell_notice = new WPSEO_Product_Upsell_Notice();
-		$upsell_notice->set_upgrade_notice();
-
 		/**
 		 * Filter: 'wpseo_run_upgrade' - Runs the upgrade hook which are dependent on Yoast SEO.
 		 *
@@ -154,9 +150,9 @@ protected function add_upgrade_history( $current_version, $new_version ) {
 	 */
 	protected function finish_up( $previous_version = null ) {
 		if ( $previous_version ) {
-			WPSEO_Options::set( 'previous_version', $previous_version );
+			WPSEO_Options::set( 'previous_version', $previous_version, 'wpseo' );
 		}
-		WPSEO_Options::set( 'version', WPSEO_VERSION );
+		WPSEO_Options::set( 'version', WPSEO_VERSION, 'wpseo' );
 
 		// Just flush rewrites, always, to at least make them work after an upgrade.
 		add_action( 'shutdown', 'flush_rewrite_rules' );

inc/class-wpseo-meta.php

@@ -240,7 +240,7 @@ class WPSEO_Meta {
 	 */
 	public static function init() {
 		foreach ( self::$social_networks as $option => $network ) {
-			if ( WPSEO_Options::get( $option, false ) === true ) {
+			if ( WPSEO_Options::get( $option, false, [ 'wpseo_social' ] ) === true ) {
 				foreach ( self::$social_fields as $box => $type ) {
 					self::$meta_fields['social'][ $network . '-' . $box ] = [
 						'type'          => $type,

inc/options/class-wpseo-option-social.php

@@ -107,7 +107,7 @@ public static function get_instance() {
 	 * @return void
 	 */
 	public function translate_defaults() {
-		self::$twitter_card_types['summary_large_image'] = __( 'Summary with large image', 'wordpress-seo' );
+		self::$twitter_card_types['summary_large_image'] = 'Summary with large image';
 	}
 
 	/**

inc/options/class-wpseo-options.php

@@ -212,10 +212,13 @@ public static function get_option_names() {
 	/**
 	 * Retrieve all the options for the SEO plugin in one go.
 	 *
+	 * @param array<string> $specific_options The option groups of the option you want to get.
+	 *
 	 * @return array Array combining the values of all the options.
 	 */
-	public static function get_all() {
-		static::$option_values = static::get_options( static::get_option_names() );
+	public static function get_all( $specific_options = [] ) {
+		$option_names          = ( empty( $specific_options ) ) ? static::get_option_names() : $specific_options;
+		static::$option_values = static::get_options( $option_names );
 
 		return static::$option_values;
 	}
@@ -269,14 +272,15 @@ public static function get_option( $option_name ) {
 	/**
 	 * Retrieve a single field from any option for the SEO plugin. Keys are always unique.
 	 *
-	 * @param string $key           The key it should return.
-	 * @param mixed  $default_value The default value that should be returned if the key isn't set.
+	 * @param string        $key           The key it should return.
+	 * @param mixed         $default_value The default value that should be returned if the key isn't set.
+	 * @param array<string> $option_groups The option groups to retrieve the option from.
 	 *
 	 * @return mixed Returns value if found, $default_value if not.
 	 */
-	public static function get( $key, $default_value = null ) {
-		if ( static::$option_values === null ) {
-			static::prime_cache();
+	public static function get( $key, $default_value = null, $option_groups = [] ) {
+		if ( ! isset( static::$option_values[ $key ] ) ) {
+			static::prime_cache( $option_groups );
 		}
 		if ( isset( static::$option_values[ $key ] ) ) {
 			return static::$option_values[ $key ];
@@ -297,23 +301,26 @@ public static function clear_cache() {
 	/**
 	 * Primes our cache.
 	 *
+	 * @param array<string> $option_groups The option groups to prime the cache with.
+	 *
 	 * @return void
 	 */
-	private static function prime_cache() {
-		static::$option_values = static::get_all();
+	private static function prime_cache( $option_groups = [] ) {
+		static::$option_values = static::get_all( $option_groups );
 		static::$option_values = static::add_ms_option( static::$option_values );
 	}
 
 	/**
 	 * Retrieve a single field from an option for the SEO plugin.
 	 *
-	 * @param string $key   The key to set.
-	 * @param mixed  $value The value to set.
+	 * @param string $key          The key to set.
+	 * @param mixed  $value        The value to set.
+	 * @param string $option_group The lookup table which represents the option_group where the key is stored.
 	 *
 	 * @return mixed|null Returns value if found, $default if not.
 	 */
-	public static function set( $key, $value ) {
-		$lookup_table = static::get_lookup_table();
+	public static function set( $key, $value, $option_group = '' ) {
+		$lookup_table = static::get_lookup_table( $option_group );
 
 		if ( isset( $lookup_table[ $key ] ) ) {
 			return static::save_option( $lookup_table[ $key ], $key, $value );
@@ -562,12 +569,15 @@ protected static function is_multisite() {
 	/**
 	 * Retrieves a lookup table to find in which option_group a key is stored.
 	 *
+	 * @param string $option_group The option_group where the key is stored.
+	 *
 	 * @return array The lookup table.
 	 */
-	private static function get_lookup_table() {
-		$lookup_table = [];
+	private static function get_lookup_table( $option_group = '' ) {
+		$lookup_table  = [];
+		$option_groups = ( $option_group === '' ) ? static::$options : [ $option_group => static::$options[ $option_group ] ];
 
-		foreach ( array_keys( static::$options ) as $option_name ) {
+		foreach ( array_keys( $option_groups ) as $option_name ) {
 			$full_option = static::get_option( $option_name );
 			foreach ( $full_option as $key => $value ) {
 				$lookup_table[ $key ] = $option_name;

package.json

@@ -47,6 +47,7 @@
     "@yoast/browserslist-config": "^1.2.3",
     "@yoast/grunt-plugin-tasks": "^2.4",
     "@yoast/postcss-preset": "^1.2.0",
+    "@yoast/related-keyphrase-suggestions": "^0.1.0",
     "@yoast/tailwindcss-preset": "^2.3.0",
     "@yoast/ui-library": "^4.0.0",
     "colors": "1.4.0",
@@ -76,7 +77,7 @@
     "webpack-bundle-analyzer": "^4.9.1"
   },
   "yoast": {
-    "pluginVersion": "23.8"
+    "pluginVersion": "23.9"
   },
   "version": "0.0.0"
 }

packages/analysis-report/src/AnalysisList.js

@@ -71,7 +71,7 @@ export default function AnalysisList( props ) {
 
 			let ariaLabelMarks = "";
 			if ( props.marksButtonStatus === "disabled" ) {
-				ariaLabelMarks = __( "Marks are disabled in current view", "wordpress-seo" );
+				ariaLabelMarks = __( "Highlighting is currently disabled", "wordpress-seo" );
 			} else if ( isMarkButtonPressed ) {
 				ariaLabelMarks = __( "Remove highlight from the text", "wordpress-seo" );
 			} else {

packages/analysis-report/tests/AnalysisListTest.js

@@ -89,7 +89,7 @@ describe( "The AnalysisList component", () => {
 
 		expect( analysisResults ).toHaveLength( results.length );
 
-		expect( analysisResults[ 0 ].props.ariaLabelMarks ).toEqual( "Marks are disabled in current view" );
+		expect( analysisResults[ 0 ].props.ariaLabelMarks ).toEqual( "Highlighting is currently disabled" );
 	} );
 
 	it( "renders a list of analysis results with one upsell result", () => {