Changeset 57543

Timestamp:

02/06/2024 07:40:21 PM (14 months ago)

Author:

youknowriad

Message:

Editor: Show the patterns page for classic themes.

Block themes and classic themes with template parts support
can already access the patterns list within the site editor.
This adds a "Patterns" menu item under Appearance for classic themes
without template parts support.

Props wildworks, kevin940726, aaronrobertshaw, fabiankaegy, swissspidy, get_dave, kebbet.
Fixes #58827.

Location:

trunk/src

Files:

• wp-admin/menu.php (modified) (2 diffs)
• wp-admin/site-editor.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)

trunk/src/wp-admin/menu.php

@@ -206 +206 @@
 if ( wp_is_block_theme() ) {
     $submenu['themes.php'][6] = array( _x( 'Editor', 'site editor menu item' ), 'edit_theme_options', 'site-editor.php' );
+} else {
+    $submenu['themes.php'][6] = array( __( 'Patterns', 'site editor menu item' ), 'edit_theme_options', 'edit.php?post_type=wp_block' );
 }
 
 if ( ! wp_is_block_theme() && current_theme_supports( 'block-template-parts' ) ) {
-    $submenu['themes.php'][6] = array(
+    $submenu['themes.php'][7] = array(
         __( 'Template Parts' ),
         'edit_theme_options',
@@ -221 +223 @@
 // is using 'customize_register' to add a setting.
 if ( ! wp_is_block_theme() || has_action( 'customize_register' ) ) {
-    $position = ( wp_is_block_theme() || current_theme_supports( 'block-template-parts' ) ) ? 7 : 6;
+    $position = ! wp_is_block_theme() && current_theme_supports( 'block-template-parts' ) ? 8 : 7;
 
     $submenu['themes.php'][ $position ] = array( __( 'Customize' ), 'customize', esc_url( $customize_url ), '', 'hide-if-no-customize' );

trunk/src/wp-admin/site-editor.php

@@ -20 +20 @@
 }
 
-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        = 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;
+$is_patterns             = isset( $_GET['postType'] ) && 'wp_block' === sanitize_key( $_GET['postType'] );
+$is_patterns_path        = isset( $_GET['path'] ) && 'patterns' === sanitize_key( $_GET['path'] );
+$is_patterns_editor      = $is_patterns || $is_patterns_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.' ) );
+if ( ! wp_is_block_theme() ) {
+    if ( ! current_theme_supports( 'block-template-parts' ) && $is_template_part_editor ) {
+        wp_die( __( 'The theme you are currently using is not compatible with the Site Editor.' ) );
+    } elseif ( ! $is_patterns_editor && ! $is_template_part_editor ) {
+        wp_die( __( 'The theme you are currently using is not compatible with the Site Editor.' ) );
+    }
 }
 

trunk/src/wp-includes/functions.php

@@ -5396 +5396 @@
         $submenu['themes.php'][] = array( $menu_name, 'edit_theme_options', 'widgets.php' );
     } else {
-        $submenu['themes.php'][7] = array( $menu_name, 'edit_theme_options', 'widgets.php' );
+        $submenu['themes.php'][8] = array( $menu_name, 'edit_theme_options', 'widgets.php' );
     }