From 888e60a012400b4ac448d6d36fba7a8372b2ff87 Mon Sep 17 00:00:00 2001 From: audrasjb Date: Tue, 25 Jul 2023 14:33:23 +0000 Subject: [PATCH] Editor: Fix conditionals in Template Editing Mode. Previously, Site Editor client-side routing started using only the path query argument for loading non-editor views. The router removed the `postType` query argument, which caused an error message to be displayed when the template parts list page was reloaded. This changeset fixes the issue as it was affecting hybrid themes. Props Mamaduka, isabel_brison, ramonopoly. Fixes #58889. Built from https://develop.svn.wordpress.org/trunk@56302 git-svn-id: http://core.svn.wordpress.org/trunk@55814 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/menu.php | 2 +- wp-admin/site-editor.php | 5 ++++- wp-includes/version.php | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/wp-admin/menu.php b/wp-admin/menu.php index 75e3d7e065..17317f9daa 100644 --- a/wp-admin/menu.php +++ b/wp-admin/menu.php @@ -210,7 +210,7 @@ if ( ! wp_is_block_theme() && current_theme_supports( 'block-template-parts' ) ) $submenu['themes.php'][6] = array( __( 'Template Parts' ), 'edit_theme_options', - 'site-editor.php?postType=wp_template_part&path=/wp_template_part/all', + 'site-editor.php?path=/wp_template_part/all', ); } diff --git a/wp-admin/site-editor.php b/wp-admin/site-editor.php index 6c4efd2a50..93b1a93131 100644 --- a/wp-admin/site-editor.php +++ b/wp-admin/site-editor.php @@ -23,7 +23,10 @@ if ( ! ( current_theme_supports( 'block-template-parts' ) || wp_is_block_theme() wp_die( __( 'The theme you are currently using is not compatible with the Site Editor.' ) ); } -$is_template_part_editor = isset( $_GET['postType'] ) && 'wp_template_part' === sanitize_key( $_GET['postType'] ); +$is_template_part = isset( $_GET['postType'] ) && 'wp_template_part' === sanitize_key( $_GET['postType'] ); +$is_template_part_path = isset( $_GET['path'] ) && 'wp_template_partall' === sanitize_key( $_GET['path'] ); +$is_template_part_editor = $is_template_part || $is_template_part_path; + if ( ! wp_is_block_theme() && ! $is_template_part_editor ) { wp_die( __( 'The theme you are currently using is not compatible with the Site Editor.' ) ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 9811d9686e..1c5cb5b435 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.4-alpha-56301'; +$wp_version = '6.4-alpha-56302'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.