Skip to content

Commit

Permalink
Merge branch 'release/24.0' of github.com:Yoast/wordpress-seo into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
mhkuu committed Nov 22, 2024
2 parents c8ccdfb + a0d5866 commit ed272a2
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions admin/class-gutenberg-compatibility.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ class WPSEO_Gutenberg_Compatibility {
*
* @var string
*/
public const CURRENT_RELEASE = '19.6.4';
public const CURRENT_RELEASE = '19.7.0';

/**
* The minimally supported version of Gutenberg by the plugin.
*
* @var string
*/
public const MINIMUM_SUPPORTED = '19.6.4';
public const MINIMUM_SUPPORTED = '19.7.0';

/**
* Holds the current version.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"webpack-bundle-analyzer": "^4.9.1"
},
"yoast": {
"pluginVersion": "24.0-RC2"
"pluginVersion": "24.0-RC3"
},
"version": "0.0.0"
}
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ export function determineRegularStem( word, morphologyData ) {
Please note that if the adjective ends in -y and -e, the ending is removed, e.g. 'acute' -> 'acut'.
The list is not exhaustive and can be expanded if needed. Oxford dictionary was used to check if the forms indeed exist, e.g. "acuter".
*/
const multiSyllableAdjWithSuffixes = morphologyData.adjectives.multiSyllableAdjectives.list;
const multiSyllableAdjWithSuffixes = morphologyData.adjectives.multiSyllableAdjectives
? morphologyData.adjectives.multiSyllableAdjectives.list
: [];

const baseIfAdjective = getAdjectiveStem( word, regexAdjective, stopAdjectives, multiSyllableAdjWithSuffixes ).base;
possibleRegularBases.push( baseIfAdjective );
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
\define( 'YOAST_VENDOR_PREFIX_DIRECTORY', 'vendor_prefixed' );

\define( 'YOAST_SEO_PHP_REQUIRED', '7.2.5' );
\define( 'YOAST_SEO_WP_TESTED', '6.7' );
\define( 'YOAST_SEO_WP_TESTED', '6.7.1' );
\define( 'YOAST_SEO_WP_REQUIRED', '6.5' );

if ( ! \defined( 'WPSEO_NAMESPACES' ) ) {
Expand Down
4 changes: 2 additions & 2 deletions wp-seo-main.php
Original file line number Diff line number Diff line change
Expand Up @@ -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', '24.0-RC2' );
define( 'WPSEO_VERSION', '24.0-RC3' );


if ( ! defined( 'WPSEO_PATH' ) ) {
Expand All @@ -35,7 +35,7 @@
define( 'YOAST_VENDOR_PREFIX_DIRECTORY', 'vendor_prefixed' );

define( 'YOAST_SEO_PHP_REQUIRED', '7.2.5' );
define( 'YOAST_SEO_WP_TESTED', '6.7' );
define( 'YOAST_SEO_WP_TESTED', '6.7.1' );
define( 'YOAST_SEO_WP_REQUIRED', '6.5' );

if ( ! defined( 'WPSEO_NAMESPACES' ) ) {
Expand Down
2 changes: 1 addition & 1 deletion wp-seo.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* @wordpress-plugin
* Plugin Name: Yoast SEO
* Version: 24.0-RC2
* Version: 24.0-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
Expand Down

0 comments on commit ed272a2

Please sign in to comment.