Changeset 59968

Timestamp:

03/11/2025 12:31:07 PM (6 weeks ago)

Author:

joemcgill

Message:

Themes: Fix resolution of parent themes.

This fixes an issue introduced in [59885] whereby calling WP_Theme:is_block_theme() before themes are set up resulted in the parent theme to not be resolved. To address this, post support for editor default-mode has been moved to a standalone callback, wp_set_editor_default_mode(), which is called on the after_setup_theme hook. In addition, if WP_Theme::is_block_theme is called too early, a _doing_it_wrong() error will now be thrown.

Props fabiankaegy, joemcgill, peterwilsoncc, jorbin, krupajnanda, riddhidave, ugyensupport, navi161, manojmaharrshi, Ankit K Gupta, narenin, shailu25, pooja1210.
Fixes #63062.

Location:

trunk/src/wp-includes

Files:

• class-wp-theme.php (modified) (1 diff)
• default-filters.php (modified) (1 diff)
• post.php (modified) (2 diffs)

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

@@ -1577 +1577 @@
      */
     public function is_block_theme() {
+        if ( ! did_action( 'setup_theme' ) ) {
+            _doing_it_wrong( __METHOD__, __( 'This method should not be called before themes are set up.' ), '6.8.0' );
+            return false;
+        }
+
         if ( isset( $this->block_theme ) ) {
             return $this->block_theme;

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

@@ -738 +738 @@
 add_action( 'wp_footer', 'the_block_template_skip_link' ); // Retained for backwards-compatibility. Unhooked by wp_enqueue_block_template_skip_link().
 add_action( 'after_setup_theme', 'wp_enable_block_templates', 1 );
+add_action( 'after_setup_theme', 'wp_set_editor_default_mode', 2 ); // Run after enabling block templates.
 add_action( 'wp_loaded', '_add_template_loader_filters' );
 

trunk/src/wp-includes/post.php

@@ -69 +69 @@
         )
     );
-
-    // Enhance page editor for block themes by rendering template and content blocks.
-    if ( wp_is_block_theme() && current_theme_supports( 'block-templates' ) ) {
-        add_post_type_support( 'page', 'editor', array( 'default-mode' => 'template-locked' ) );
-    }
 
     register_post_type(
@@ -8530 +8525 @@
     );
 }
+
+/**
+ * Sets the default editor mode based on support for block templates.
+ *
+ * @since 6.8.0
+ */
+function wp_set_editor_default_mode() {
+    if ( wp_is_block_theme() && current_theme_supports( 'block-templates' ) ) {
+        add_post_type_support( 'page', 'editor', array( 'default-mode' => 'template-locked' ) );
+    }
+}