From e555884096824a038a3ffd5c9b53176c9798fa2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Wed, 13 Apr 2022 11:19:23 +0200
Subject: [PATCH] Consider 6.0 from beta1 so we can test this properly

---
 lib/compat/wordpress-6.0/block-editor-settings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/compat/wordpress-6.0/block-editor-settings.php b/lib/compat/wordpress-6.0/block-editor-settings.php
index d400939b018d23..e76f6a40a6230a 100644
--- a/lib/compat/wordpress-6.0/block-editor-settings.php
+++ b/lib/compat/wordpress-6.0/block-editor-settings.php
@@ -70,8 +70,8 @@ function gutenberg_get_block_editor_settings( $settings ) {
 	if ( 'other' === $context ) {
 		global $wp_version;
 		$is_wp_5_8 = version_compare( $wp_version, '5.8', '>=' ) && version_compare( $wp_version, '5.9', '<' );
-		$is_wp_5_9 = version_compare( $wp_version, '5.9', '>=' ) && version_compare( $wp_version, '6.0', '<' );
-		$is_wp_6_0 = version_compare( $wp_version, '6.0', '>=' );
+		$is_wp_5_9 = version_compare( $wp_version, '5.9', '>=' ) && version_compare( $wp_version, '6.0-beta1', '<' );
+		$is_wp_6_0 = version_compare( $wp_version, '6.0-beta1', '>=' );
 
 		// Make sure the styles array exists.
 		// In some contexts, like the navigation editor, it doesn't.