Changeset 61195

Timestamp:

11/10/2025 09:04:46 PM (2 months ago)

Author:

westonruter

Message:

Themes: Restore 'Live Preview' button for block themes.

Note that the return query parameter is not yet functional in the Site Editor. See ​Gutenberg#47934.

Follow-up to [52341], [52346], [52353], [52802].

Props ninomiho, mcsf, dhruval04, praful2111, mlaetitia1986.
See #54578.
Fixes #64159.

Location:

trunk/src/wp-admin

Files:

• includes/class-theme-installer-skin.php (modified) (1 diff)
• themes.php (modified) (4 diffs)

trunk/src/wp-admin/includes/class-theme-installer-skin.php

@@ -122 +122 @@
         $install_actions = array();
 
-        if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) && ! $theme_info->is_block_theme() ) {
-            $customize_url = add_query_arg(
-                array(
-                    'theme'  => urlencode( $stylesheet ),
-                    'return' => urlencode( admin_url( 'web' === $this->type ? 'theme-install.php' : 'themes.php' ) ),
-                ),
-                admin_url( 'customize.php' )
-            );
+        if ( current_user_can( 'edit_theme_options' ) && ( $theme_info->is_block_theme() || current_user_can( 'customize' ) ) ) {
+            if ( $theme_info->is_block_theme() ) {
+                $customize_url = add_query_arg(
+                    array(
+                        'wp_theme_preview' => urlencode( $stylesheet ),
+                        'return'           => urlencode( admin_url( 'web' === $this->type ? 'theme-install.php' : 'themes.php' ) ),
+                    ),
+                    admin_url( 'site-editor.php' )
+                );
+            } else {
+                $customize_url = add_query_arg(
+                    array(
+                        'theme'  => urlencode( $stylesheet ),
+                        'return' => urlencode( admin_url( 'web' === $this->type ? 'theme-install.php' : 'themes.php' ) ),
+                    ),
+                    admin_url( 'customize.php' )
+                );
+            }
 
             $install_actions['preview'] = sprintf(

trunk/src/wp-admin/themes.php

@@ -646 +646 @@
 
             <?php
-            if ( ! $theme['blockTheme'] && current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
+            if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
                 /* translators: %s: Theme name. */
                 $live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
@@ -1035 +1035 @@
                     ><?php _ex( 'Cannot Activate', 'theme' ); ?></a>
 
-                    <# if ( ! data.blockTheme ) { #>
-                        <?php
-                        /* translators: %s: Theme name. */
-                        $live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
-                        ?>
-                        <a class="button button-primary hide-if-no-customize disabled"
-                            aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>"
-                        ><?php _e( 'Live Preview' ); ?></a>
-                    <# } #>
+                    <?php
+                    /* translators: %s: Theme name. */
+                    $live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
+                    ?>
+                    <a class="button button-primary hide-if-no-customize disabled"
+                        aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>"
+                    ><?php _e( 'Live Preview' ); ?></a>
                 <# } #>
             <# } #>
@@ -1262 +1260 @@
             <div class="inactive-theme">
                 <# if ( data.compatibleWP && data.compatiblePHP ) { #>
-                    <# if ( ! data.blockTheme ) { #>
-                        <?php
-                        /* translators: %s: Theme name. */
-                        $live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
-                        ?>
-                        <a class="button button-primary load-customize hide-if-no-customize"
-                            href="{{{ data.actions.customize }}}"
-                            aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>"
-                        ><?php _e( 'Live Preview' ); ?></a>
-                    <# } #>
+                    <?php
+                    /* translators: %s: Theme name. */
+                    $live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
+                    ?>
+                    <a class="button button-primary load-customize hide-if-no-customize"
+                        href="{{{ data.actions.customize }}}"
+                        aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>"
+                    ><?php _e( 'Live Preview' ); ?></a>
 
                     <# if ( data.actions.activate ) { #>
@@ -1284 +1280 @@
                     <# } #>
                 <# } else { #>
-                    <# if ( ! data.blockTheme ) { #>
-                        <?php
-                        /* translators: %s: Theme name. */
-                        $live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
-                        ?>
-                        <a class="button button-primary hide-if-no-customize disabled"
-                            aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>"
-                        ><?php _e( 'Live Preview' ); ?></a>
-                    <# } #>
+                    <?php
+                    /* translators: %s: Theme name. */
+                    $live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
+                    ?>
+                    <a class="button button-primary hide-if-no-customize disabled"
+                        aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>"
+                    ><?php _e( 'Live Preview' ); ?></a>
 
                     <# if ( data.actions.activate ) { #>