Changeset 56758

Timestamp:

10/02/2023 10:54:29 PM (12 months ago)

Author:

danielbachhuber

Message:

Editor: Prevent possibility of a fatal error when previewing block themes.

Ensures that preview callbacks attached to the stylesheet and template filters do not run before pluggable.php has been included. These callbacks need functionality from pluggable.php.

Props scruffian, johnbillion, SergeyBiryukov, okat, azaozz.
Merges [56529] and [56757] to the 6.3 branch.
Fixes #59000.

Location:

branches/6.3

Files:

• . (modified) (1 prop)
• src/wp-includes/default-filters.php (modified) (1 diff)
• src/wp-includes/theme-previews.php (modified) (1 diff)
• tests/phpunit/tests/theme-previews.php (copied) (copied from trunk/tests/phpunit/tests/theme-previews.php) (1 diff)

branches/6.3/src/wp-includes/default-filters.php

@@ -534 +534 @@
 add_action( 'transition_post_status', '_wp_keep_alive_customize_changeset_dependent_auto_drafts', 20, 3 );
 
+// Block Theme Previews.
+add_action( 'plugins_loaded', 'wp_initialize_theme_preview_hooks', 1 );
+
 // Calendar widget cache.
 add_action( 'save_post', 'delete_get_calendar_cache' );

branches/6.3/src/wp-includes/theme-previews.php

@@ -76 +76 @@
 }
 
-// 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' );
-    add_action( 'admin_head', 'wp_block_theme_activate_nonce' );
+/**
+ * Add filters and actions to enable Block Theme Previews in the Site Editor.
+ *
+ * The filters and actions should be added after `pluggable.php` is included as they may
+ * trigger code that uses `current_user_can()` which requires functionality from `pluggable.php`.
+ *
+ * @since 6.3.2
+ */
+function wp_initialize_theme_preview_hooks() {
+    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' );
+        add_action( 'admin_head', 'wp_block_theme_activate_nonce' );
+    }
 }

branches/6.3/tests/phpunit/tests/theme-previews.php

@@ -18 +18 @@
     public function test_initialize_theme_preview_hooks() {
         $_GET['wp_theme_preview'] = 'twentytwentythree';
-        do_action( 'plugins_loaded' ); // Ensure `plugins_loaded` triggers `initialize_theme_preview_hooks`.
+        do_action( 'plugins_loaded' ); // Ensure `plugins_loaded` triggers `wp_initialize_theme_preview_hooks`.
 
         $this->assertEquals( has_filter( 'stylesheet', 'wp_get_theme_preview_path' ), 10 );