diff --git a/admin/class-gutenberg-compatibility.php b/admin/class-gutenberg-compatibility.php index 379fc228c60..e9c1fe82bad 100644 --- a/admin/class-gutenberg-compatibility.php +++ b/admin/class-gutenberg-compatibility.php @@ -15,14 +15,14 @@ class WPSEO_Gutenberg_Compatibility { * * @var string */ - const CURRENT_RELEASE = '15.9.1'; + const CURRENT_RELEASE = '16.0.0'; /** * The minimally supported version of Gutenberg by the plugin. * * @var string */ - const MINIMUM_SUPPORTED = '15.9.1'; + const MINIMUM_SUPPORTED = '16.0.0'; /** * Holds the current version. diff --git a/admin/watchers/class-slug-change-watcher.php b/admin/watchers/class-slug-change-watcher.php index 4bb683e4786..8b73a6eb845 100644 --- a/admin/watchers/class-slug-change-watcher.php +++ b/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 ); diff --git a/css/src/tailwind.css b/css/src/tailwind.css index 995539cda7b..672131493c9 100644 --- a/css/src/tailwind.css +++ b/css/src/tailwind.css @@ -55,7 +55,7 @@ /* Override aggressive WordPress inputs styling */ .yst-input { - @apply yst-py-2 yst-px-3 yst-border yst-bg-white yst-rounded-md yst-shadow-sm yst-text-sm yst-placeholder-gray-400 !important; + @apply yst-py-2 yst-px-3 yst-border yst-bg-white yst-rounded-md yst-shadow-sm yst-text-sm !important; } .yst-radio { diff --git a/package.json b/package.json index 206ae4a83c7..22f409bf38a 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "typescript": "^4.2.4" }, "yoast": { - "pluginVersion": "20.10-RC1" + "pluginVersion": "20.10-RC3" }, "version": "0.0.0" } diff --git a/packages/js/src/components/WincherPerformanceReport.js b/packages/js/src/components/WincherPerformanceReport.js index 166d8cb6742..9d0eb6dadf5 100644 --- a/packages/js/src/components/WincherPerformanceReport.js +++ b/packages/js/src/components/WincherPerformanceReport.js @@ -444,6 +444,15 @@ WincherSEOPerformanceTable.propTypes = { children: PropTypes.any, }; +/** + * Checks whether Wincher performance data has results. + * + * @param {Object} data the Wincher performance data. + * + * @returns {boolean} Whether Wincher performance data has results. + */ +const checkHasResults = ( data ) => data && ! isEmpty( data ) && ! isEmpty( data.results ); + /** * The Dashboard Wincher SEO Performance component. * @@ -455,16 +464,17 @@ const WincherPerformanceReport = ( props ) => { const { className, websiteId, isLoggedIn, onConnectAction, isConnectSuccess } = props; const data = isLoggedIn ? props.data : fakeWincherPerformanceData; const isBlurred = ! isLoggedIn; + const hasResults = checkHasResults( data ); return ( - + { isLoggedIn && } - { data && ! isEmpty( data ) && ! isEmpty( data.results ) && + { hasResults && diff --git a/packages/js/src/components/WincherSEOPerformance.js b/packages/js/src/components/WincherSEOPerformance.js index 87a1c506204..33776ab5ead 100644 --- a/packages/js/src/components/WincherSEOPerformance.js +++ b/packages/js/src/components/WincherSEOPerformance.js @@ -287,7 +287,7 @@ export default function WincherSEOPerformance( props ) { return ( { isNewlyAuthenticated && } - + { isLoggedIn && } { __( "SEO performance", "wordpress-seo" ) } diff --git a/packages/js/src/support/app.js b/packages/js/src/support/app.js index 82ab85d8954..c35b9fdd1e0 100644 --- a/packages/js/src/support/app.js +++ b/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> diff --git a/packages/ui-library/src/components/root/style.css b/packages/ui-library/src/components/root/style.css index 9860573347d..a2947097b0e 100644 --- a/packages/ui-library/src/components/root/style.css +++ b/packages/ui-library/src/components/root/style.css @@ -438,6 +438,22 @@ visited:hover:yst-text-primary-400; } + [type='text'], + [type='email'], + [type='url'], + [type='password'], + [type='number'], + [type='date'], + [type='datetime-local'], + [type='month'], + [type='search'], + [type='tel'], + [type='time'], + [type='week'], + textarea { + @apply yst-placeholder-slate-500; + } + svg path { stroke-width: inherit; } diff --git a/packages/ui-library/src/elements/text-input/style.css b/packages/ui-library/src/elements/text-input/style.css index 0b3658e89da..8b0a5f9aeb7 100644 --- a/packages/ui-library/src/elements/text-input/style.css +++ b/packages/ui-library/src/elements/text-input/style.css @@ -10,8 +10,7 @@ yst-rounded-md yst-shadow-sm yst-text-sm - yst-text-slate-800 - yst-placeholder-slate-500 + yst-text-slate-800 yst-bg-white focus:yst-outline-none focus:yst-ring-primary-500 diff --git a/packages/ui-library/src/elements/textarea/style.css b/packages/ui-library/src/elements/textarea/style.css index c4e65b851e3..42658fe4a02 100644 --- a/packages/ui-library/src/elements/textarea/style.css +++ b/packages/ui-library/src/elements/textarea/style.css @@ -11,8 +11,7 @@ yst-shadow-sm yst-bg-white yst-text-sm - yst-text-slate-800 - yst-placeholder-slate-500 + yst-text-slate-800 focus:yst-outline-none focus:yst-ring-primary-500 focus:yst-border-primary-500; diff --git a/readme.txt b/readme.txt index 1fb0255153f..52553fbb796 100644 --- a/readme.txt +++ b/readme.txt @@ -252,8 +252,7 @@ Release date: 2023-06-27 #### Enhancements * Adds a support page to the Yoast admin. -* Add the Wincher upgrade callout to the Wincher performance report on the dashboard. -* Add the Wincher upgrade callout to the Wincher SEO performance on the edit post page. +* Adds the Wincher upgrade callout to the Wincher performance report on the dashboard and to the Wincher SEO performance on the edit post page. * Excludes the Yoast SEO Breadcrumbs widget from the content analysis in Elementor Pro. * Expands the list of HTML elements excluded from the content analysis. * Introduces a new setting for crawl optimization, that disallows AdsBot crawling when enabled. @@ -262,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 @@ -277,7 +278,7 @@ In Yoast SEO 20.9, you'll find improvements to our Wincher integration. We've ad #### Enhancements -* Adds a new widget on the dasboard that shows your top keywords added to Yoast SEO with Wincher. Provides a connection button if you haven't yet connected your site to Wincher. +* Adds a new widget on the dashboard that shows your top keywords added to Yoast SEO with Wincher. Provides a connection button if you haven't yet connected your site to Wincher. * Tightens crawl optimization site search blocking rules. * We now automatically schedule background performance optimization processes (via WP Cron). diff --git a/wp-seo-main.php b/wp-seo-main.php index 21dbb775a91..2de528ce963 100644 --- a/wp-seo-main.php +++ b/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-RC1' ); +define( 'WPSEO_VERSION', '20.10-RC3' ); if ( ! defined( 'WPSEO_PATH' ) ) { diff --git a/wp-seo.php b/wp-seo.php index b90cb65b504..ed694c8b06e 100644 --- a/wp-seo.php +++ b/wp-seo.php @@ -8,7 +8,7 @@ * * @wordpress-plugin * Plugin Name: Yoast SEO - * Version: 20.10-RC1 + * 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 @@ -20,7 +20,7 @@ * Requires PHP: 7.2.5 * * WC requires at least: 7.1 - * WC tested up to: 7.7 + * WC tested up to: 7.8 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by