diff --git a/gutenberg.php b/gutenberg.php index ebf360f10fccc..bf46707ec50d3 100644 --- a/gutenberg.php +++ b/gutenberg.php @@ -26,7 +26,7 @@ function gutenberg_wordpress_version_notice() { echo '

'; /* translators: %s: Minimum required version */ - printf( __( 'Gutenberg requires WordPress %s or later to function properly. Please upgrade WordPress before activating Gutenberg.', 'gutenberg' ), '5.8' ); + printf( __( 'Gutenberg requires WordPress %s or later to function properly. Please upgrade WordPress before activating Gutenberg.', 'gutenberg' ), '5.9' ); echo '

'; deactivate_plugins( array( 'gutenberg/gutenberg.php' ) ); @@ -64,7 +64,7 @@ function gutenberg_pre_init() { // Compare against major release versions (X.Y) rather than minor (X.Y.Z) // unless a minor release is the actual minimum requirement. WordPress reports // X.Y for its major releases. - if ( version_compare( $version, '5.8', '<' ) ) { + if ( version_compare( $version, '5.9', '<' ) ) { add_action( 'admin_notices', 'gutenberg_wordpress_version_notice' ); return; } diff --git a/lib/init.php b/lib/init.php index 9ba46a1f41fa2..b867dd472552f 100644 --- a/lib/init.php +++ b/lib/init.php @@ -58,30 +58,6 @@ function gutenberg_menu() { } add_action( 'admin_menu', 'gutenberg_menu', 9 ); -/** - * Site editor's Menu. - * - * Adds a new wp-admin menu item for the Site editor. - * - * @since 9.4.0 - */ -function gutenberg_site_editor_menu() { - if ( wp_is_block_theme() ) { - add_theme_page( - __( 'Editor (beta)', 'gutenberg' ), - sprintf( - /* translators: %s: "beta" label. */ - __( 'Editor %s', 'gutenberg' ), - '' . __( 'beta', 'gutenberg' ) . '' - ), - 'edit_theme_options', - 'gutenberg-edit-site', - 'gutenberg_edit_site_page' - ); - } -} -add_action( 'admin_menu', 'gutenberg_site_editor_menu', 9 ); - /** * Outputs a WP REST API nonce. */ diff --git a/packages/e2e-test-utils-playwright/src/admin/visit-site-editor.ts b/packages/e2e-test-utils-playwright/src/admin/visit-site-editor.ts index 0c374f2fe404b..ab66de030feb2 100644 --- a/packages/e2e-test-utils-playwright/src/admin/visit-site-editor.ts +++ b/packages/e2e-test-utils-playwright/src/admin/visit-site-editor.ts @@ -30,11 +30,10 @@ export async function visitSiteEditor( skipWelcomeGuide = true ) { const path = addQueryArgs( '', { - page: 'gutenberg-edit-site', ...query, } ).slice( 1 ); - await this.visitAdminPage( 'themes.php', path ); + await this.visitAdminPage( 'site-editor.php', path ); await this.page.waitForSelector( CANVAS_SELECTOR ); if ( skipWelcomeGuide ) { diff --git a/packages/e2e-test-utils/src/site-editor.js b/packages/e2e-test-utils/src/site-editor.js index e32ad01cc396e..a30d8b5455037 100644 --- a/packages/e2e-test-utils/src/site-editor.js +++ b/packages/e2e-test-utils/src/site-editor.js @@ -248,11 +248,10 @@ export async function siteEditorNavigateSequence( labels ) { */ export async function visitSiteEditor( query, skipWelcomeGuide = true ) { query = addQueryArgs( '', { - page: 'gutenberg-edit-site', ...query, } ).slice( 1 ); - await visitAdminPage( 'themes.php', query ); + await visitAdminPage( 'site-editor.php', query ); await page.waitForSelector( SELECTORS.visualEditor ); if ( skipWelcomeGuide ) {