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

Timestamp:

12/07/2021 12:00:45 AM (3 years ago)

Author:

hellofromTonya

Message:

Themes: Better names for WP_Theme::is_block_theme() and wp_is_block_theme() and make wp_is_block_theme() a wrapper.

This commit renames the following method and function to better represent block theme terminology:

• WP_Theme::is_block_based() to WP_Theme::is_block_theme()
• wp_is_block_template_theme() to wp_is_block_theme()

It also changes wp_is_block_theme() to be a helper wrapper (sugar syntax) for wp_get_theme()->is_block_theme();. Why? To ensure both the method and function behave the same, to help Gutenberg maintain WordPress cross-version compatibility, and to make it less cumbersome to port changes from Gutenberg to Core.

Follow-up to [52069], [52247], [52279].

Props antonvlasenko, costdev, hellofromTonya, noisysocks.
Fixes #54550.

File:

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

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

@@ -1994 +1994 @@
     $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 ) {
+    $is_block_theme         = wp_is_block_theme();
+
+    if ( $is_block_theme && $can_edit_theme_options ) {
         $customize_url = esc_url( admin_url( 'site-editor.php' ) );
-    } elseif ( ! $is_block_based_theme && $can_customize ) {
+    } elseif ( ! $is_block_theme && $can_customize ) {
         $customize_url = wp_customize_url();
     }
@@ -2013 +2013 @@
         <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 = $can_customize && ! $is_block_based_theme ? add_query_arg( 'autofocus[panel]', 'themes', admin_url( 'customize.php' ) ) : admin_url( 'themes.php' ); ?>
+            <?php $themes_link = $can_customize && ! $is_block_theme ? add_query_arg( 'autofocus[panel]', 'themes', admin_url( 'customize.php' ) ) : admin_url( 'themes.php' ); ?>
             <p class="hide-if-no-customize">
                 <?php