Changeset 52819

Timestamp:

03/04/2022 02:37:58 AM (5 years ago)

Author:

peterwilsoncc

Message:

Themes: Hide block themes' live preview link following installation.

Prevent the Customizer/Live Preview button from showing for installed block themes when on the theme installation page.

Props antonvlasenko, costdev, ironprogrammer.
Fixes #54878.

Location:

trunk/src

Files:

• js/_enqueues/wp/theme.js (modified) (1 diff)
• wp-admin/includes/ajax-actions.php (modified) (3 diffs)
• wp-admin/theme-install.php (modified) (2 diffs)

trunk/src/js/_enqueues/wp/theme.js

@@ -623 +623 @@
                                 _this.model.set( { 'installed': true } );
                         }
+                        if ( response.blockTheme ) {
+                                _this.model.set( { 'block_theme': true } );
+                        }
                 } );
 

trunk/src/wp-admin/includes/ajax-actions.php

@@ -3569 +3569 @@
         $update_php = network_admin_url( 'update.php?action=install-theme' );
 
+        $installed_themes = search_theme_directories();
+
+        if ( false === $installed_themes ) {
+                $installed_themes = array();
+        }
+
+        foreach ( $installed_themes as $theme_slug => $theme_data ) {
+                // Ignore child themes.
+                if ( str_contains( $theme_slug, '/' ) ) {
+                        unset( $installed_themes[ $theme_slug ] );
+                }
+        }
+
         foreach ( $api->themes as &$theme ) {
                 $theme->install_url = add_query_arg(
@@ -3600 +3613 @@
                 }
 
+                $is_theme_installed = array_key_exists( $theme->slug, $installed_themes );
+
+                // We only care about installed themes.
+                $theme->block_theme = $is_theme_installed && wp_get_theme( $theme->slug )->is_block_theme();
+
                 if ( ! is_multisite() && current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
+                        $customize_url = $theme->block_theme ? admin_url( 'site-editor.php' ) : wp_customize_url( $theme->slug );
+
                         $theme->customize_url = add_query_arg(
                                 array(
                                         'return' => urlencode( network_admin_url( 'theme-install.php', 'relative' ) ),
                                 ),
-                                wp_customize_url( $theme->slug )
+                                $customize_url
                         );
                 }
@@ -4139 +4159 @@
                 }
         }
+
+        $theme = wp_get_theme( $slug );
+        $status['blockTheme'] = $theme->is_block_theme();
 
         if ( ! is_multisite() && current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {

trunk/src/wp-admin/theme-install.php

@@ -36 +36 @@
 }
 
-foreach ( $installed_themes as $k => $v ) {
-        if ( false !== strpos( $k, '/' ) ) {
-                unset( $installed_themes[ $k ] );
+foreach ( $installed_themes as $theme_slug => $theme_data ) {
+        // Ignore child themes.
+        if ( str_contains( $theme_slug, '/' ) ) {
+                unset( $installed_themes[ $theme_slug ] );
         }
 }
@@ -374 +375 @@
                                         <# if ( data.customize_url ) { #>
                                                 <# if ( ! data.active ) { #>
-                                                        <a class="button load-customize" href="{{ data.customize_url }}"><?php _e( 'Live Preview' ); ?></a>
+                                                        <# if ( ! data.block_theme ) { #>
+                                                                <a class="button load-customize" href="{{ data.customize_url }}"><?php _e( 'Live Preview' ); ?></a>
+                                                        <# } #>
                                                 <# } else { #>
                                                         <a class="button load-customize" href="{{ data.customize_url }}"><?php _e( 'Customize' ); ?></a>