Changeset 56059

Timestamp:

06/27/2023 09:34:34 AM (16 months ago)

Author:

isabel_brison

Message:

General: add block theme previews.

Adds a preview link to block themes in the themes screen, opening the previews in the site editor.

Props onemaggie, andraganescu, audrasjb, flixos90, peterwilsoncc, spacedmonkey, scruffian.
Fixes #58561.

Location:

trunk/src/wp-admin

Files:

• includes/admin-filters.php (modified) (1 diff)
• includes/admin.php (modified) (1 diff)
• includes/theme-previews.php (added)
• includes/theme.php (modified) (1 diff)
• themes.php (modified) (2 diffs)

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

@@ -169 +169 @@
 // Append '(Draft)' to draft page titles in the privacy page dropdown.
 add_filter( 'list_pages', '_wp_privacy_settings_filter_draft_page_titles', 10, 2 );
+
+// Attaches filters to enable theme previews in the Site Editor.
+if ( ! empty( $_GET['wp_theme_preview'] ) ) {
+    add_filter( 'stylesheet', 'wp_get_theme_preview_path' );
+    add_filter( 'template', 'wp_get_theme_preview_path' );
+    add_action( 'init', 'wp_attach_theme_preview_middleware' );
+}

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

@@ -72 +72 @@
 /** WordPress Theme Administration API */
 require_once ABSPATH . 'wp-admin/includes/theme.php';
+require_once ABSPATH . 'wp-admin/includes/theme-previews.php';
 
 /** WordPress Privacy Functions */

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

@@ -712 +712 @@
 
         if ( $is_block_theme && $can_edit_theme_options ) {
-            $customize_action = esc_url( admin_url( 'site-editor.php' ) );
+            $customize_action = admin_url( 'site-editor.php' );
+            if ( $current_theme !== $slug ) {
+                $customize_action = add_query_arg( 'wp_theme_preview', $slug, $customize_action );
+            }
         } elseif ( ! $is_block_theme && $can_customize && $can_edit_theme_options ) {
-            $customize_action = esc_url(
-                add_query_arg(
-                    array(
-                        'return' => urlencode( sanitize_url( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) ),
-                    ),
-                    wp_customize_url( $slug )
-                )
+            $customize_action = wp_customize_url( $slug );
+        }
+        if ( null !== $customize_action ) {
+            $customize_action = add_query_arg(
+                array(
+                    'return' => urlencode( sanitize_url( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) ),
+                ),
+                $customize_action
             );
+            $customize_action = esc_url( $customize_action );
         }
 

trunk/src/wp-admin/themes.php

@@ -556 +556 @@
             <a class="button activate" href="<?php echo $theme['actions']['activate']; ?>" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
             <?php
-            if ( ! $theme['blockTheme'] && current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
+            // Only classic themes require the "customize" capability.
+            if ( current_user_can( 'edit_theme_options' ) && ( $theme['blockTheme'] || current_user_can( 'customize' ) ) ) {
                 /* translators: %s: Theme name. */
                 $live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
@@ -915 +916 @@
                     ?>
                     <a class="button activate" href="{{{ data.actions.activate }}}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
-                    <# if ( ! data.blockTheme ) { #>
-                        <?php
-                        /* translators: %s: Theme name. */
-                        $live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
-                        ?>
-                        <a aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>" class="button button-primary load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Live Preview' ); ?></a>
-                    <# } #>
+                    <?php
+                    /* translators: %s: Theme name. */
+                    $live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
+                    ?>
+                    <a aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>" class="button button-primary load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Live Preview' ); ?></a>
                 <# } else { #>
                     <?php