Merge branch 'release/20.10' of github.com:Yoast/wordpress-seo into t…

…runk

admin/watchers/class-slug-change-watcher.php

@@ -90,19 +90,20 @@ public function detect_post_delete( $post_id ) {
 	/**
 	 * Shows a message when a term is about to get deleted.
 	 *
-	 * @param int $term_id The term ID that will be deleted.
+	 * @param int $term_taxonomy_id The term taxonomy ID that will be deleted.
 	 *
 	 * @return void
 	 */
-	public function detect_term_delete( $term_id ) {
-		if ( ! $this->is_term_viewable( $term_id ) ) {
+	public function detect_term_delete( $term_taxonomy_id ) {
+		if ( ! $this->is_term_viewable( $term_taxonomy_id ) ) {
 			return;
 		}
+		$term = \get_term_by( 'term_taxonomy_id', (int) $term_taxonomy_id );
 
 		$first_sentence = sprintf(
 			/* translators: 1: term label */
 			__( 'You just deleted a %1$s.', 'wordpress-seo' ),
-			$this->get_taxonomy_label_for_term( $term_id )
+			$this->get_taxonomy_label_for_term( $term->term_id )
 		);
 
 		$message = $this->get_message( $first_sentence );

package.json

@@ -83,7 +83,7 @@
     "typescript": "^4.2.4"
   },
   "yoast": {
-    "pluginVersion": "20.10-RC2"
+    "pluginVersion": "20.10-RC3"
   },
   "version": "0.0.0"
 }

packages/js/src/support/app.js

@@ -163,7 +163,7 @@ export const App = () => {
 											"Yoast SEO"
 										) }
 										linkHref={ githubLink }
-										linkText={ __( "Visit our GitHub repo", "wordpress-seo" ) }
+										linkText={ __( "Write a bug report", "wordpress-seo" ) }
 									/>
 								</div>
 							</FieldsetLayout>

readme.txt

@@ -261,8 +261,10 @@ Release date: 2023-06-27
 
 #### Bugfixes
 
+* Fixes a bug where deletion notice would not appear when deleting a term when the `term_id` is different from `taxonomy_term_id`.
 * Fixes a bug where terms with custom canonical URLs would get added in the sitemap.
 * Fixes a bug where the WordPress native sitemap would not work properly after Yoast SEO was deactivated, until rewrite rules were flushed.
+* Fixes a bug where the wrong taxonomy name would appear in the notice when deleting a term.
 
 #### 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', '20.10-RC2' );
+define( 'WPSEO_VERSION', '20.10-RC3' );
 
 
 if ( ! defined( 'WPSEO_PATH' ) ) {

wp-seo.php

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