Skip to content

Commit

Permalink
more tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
ntsekouras committed Jun 21, 2022
1 parent d28aed2 commit 98973a6
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 30 deletions.
4 changes: 2 additions & 2 deletions gutenberg.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
function gutenberg_wordpress_version_notice() {
echo '<div class="error"><p>';
/* 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 '</p></div>';

deactivate_plugins( array( 'gutenberg/gutenberg.php' ) );
Expand Down Expand Up @@ -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;
}
Expand Down
24 changes: 0 additions & 24 deletions lib/init.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' ),
'<span class="awaiting-mod">' . __( 'beta', 'gutenberg' ) . '</span>'
),
'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.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {
Expand Down
3 changes: 1 addition & 2 deletions packages/e2e-test-utils/src/site-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {
Expand Down

0 comments on commit 98973a6

Please sign in to comment.