Changeset 52279 for trunk/src/wp-admin/includes/dashboard.php

Timestamp:

11/30/2021 02:25:34 PM (4 years ago)

Author:

hellofromTonya

Message:

Administration: For block themes, link to Site Editor interface instead of Customizer in Dashboard's welcome panel and Themes interface.

For block themes (like Twenty Twenty-Two), Customizer menu item is removed and replaced with the Site Editor menu item. However, other links exist in the Dashboard's welcome panel "Customize Your Site" button and the "Customize" button in each theme listed in the Appearance > Themes interface.

This commit changes each of those remaining links to link to the Site Editor interface instead of the Customizer.

To help identify block vs non-block themes, two method methods are introduced in WP_Theme:

• WP_Theme:: is_block_based() which identifies if the theme is a block theme or not.
• WP_Theme::get_file_path() which is similar to get_theme_file_path() but uses the directories within the theme object.

Both of these new methods include test coverage including the addition of a parent and child block theme in test data.

Follow-up to [18749], [35483], [42013], [42169].

Props antonvlasenko, jameskoster, hellofromTonya, matveb, noisysocks, poena, sergeybiryukov.
Fixes #54460.

File:

• trunk/src/wp-admin/includes/dashboard.php (modified) (2 diffs)

trunk/src/wp-admin/includes/dashboard.php

@@ -1988 +1988 @@
  *
  * @since 3.3.0
+ * @since 5.9.0 Send users to the Site Editor if the current theme is block-based.
  */
 function wp_welcome_panel() {
+    $customize_url          = null;
+    $can_edit_theme_options = current_user_can( 'edit_theme_options' );
+    $can_customize          = current_user_can( 'customize' );
+    $is_block_based_theme   = wp_is_block_template_theme();
+
+    if ( $is_block_based_theme && $can_edit_theme_options ) {
+        $customize_url = esc_url( admin_url( 'site-editor.php' ) );
+    } elseif ( ! $is_block_based_theme && $can_customize ) {
+        $customize_url = wp_customize_url();
+    }
     ?>
     <div class="welcome-panel-content">
@@ -1996 +2007 @@
     <div class="welcome-panel-column-container">
     <div class="welcome-panel-column">
-        <?php if ( current_user_can( 'customize' ) ) : ?>
+        <?php if ( $customize_url ) : ?>
             <h3><?php _e( 'Get Started' ); ?></h3>
-            <a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo wp_customize_url(); ?>"><?php _e( 'Customize Your Site' ); ?></a>
+            <a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo $customize_url; ?>"><?php _e( 'Customize Your Site' ); ?></a>
         <?php endif; ?>
         <a class="button button-primary button-hero hide-if-customize" href="<?php echo esc_url( admin_url( 'themes.php' ) ); ?>"><?php _e( 'Customize Your Site' ); ?></a>
         <?php if ( current_user_can( 'install_themes' ) || ( current_user_can( 'switch_themes' ) && count( wp_get_themes( array( 'allowed' => true ) ) ) > 1 ) ) : ?>
-            <?php $themes_link = current_user_can( 'customize' ) ? add_query_arg( 'autofocus[panel]', 'themes', admin_url( 'customize.php' ) ) : admin_url( 'themes.php' ); ?>
+            <?php $themes_link = $can_customize && ! $is_block_based_theme ? add_query_arg( 'autofocus[panel]', 'themes', admin_url( 'customize.php' ) ) : admin_url( 'themes.php' ); ?>
             <p class="hide-if-no-customize">
                 <?php