Changeset 52697

Timestamp:

02/09/2022 01:20:49 PM (3 years ago)

Author:

audrasjb

Message:

Query: Check if the theme supports block-templates before calling locate_block_template() in get_query_template().

This change improves performance for classic themes by removing an unnecessary query and fixes an issue where a classic theme would show "Empty template: Index" on the frontend when an empty (block-)templates/index.html file exists.

Props johnbillion, ianatkins, Mamaduka, costdev, manfcarlo, dolphingg, audrasjb, madeinua, kapilpaul, rafiahmedd, SergeyBiryukov.
Fixes #54844.

Location:

trunk

Files:

• src/wp-includes/block-template.php (modified) (1 diff)
• tests/phpunit/tests/block-template.php (modified) (1 diff)

trunk/src/wp-includes/block-template.php

@@ -48 +48 @@
 function locate_block_template( $template, $type, array $templates ) {
     global $_wp_current_template_content;
+
+    if ( ! current_theme_supports( 'block-templates' ) ) {
+        return $template;
+    }
 
     if ( $template ) {

trunk/tests/phpunit/tests/block-template.php

@@ -19 +19 @@
         parent::set_up();
         switch_theme( 'block-theme' );
+        do_action( 'setup_theme' );
     }