Changeset 56060

Timestamp:

06/27/2023 10:13:07 AM (16 months ago)

Author:

spacedmonkey

Message:

Themes: Block template is located twice in get_query_template().

When the function _template_loader_filters was ported to core from gutenberg, it retained the filter to load block templates. However, the function locate_block_template is called manually in get_query_template, so this filter is not needed. Calling locate_block_template twice, results in performance issue, as locate_block_template is a expensive function to run, as it does database and file lookups.

Props dlh, mukesh27, flixos90, SergeyBiryukov, bernhard-reiter, spacedmonkey.
Fixes #58299.

File:

• trunk/src/wp-includes/block-template.php (modified) (2 diffs)

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

@@ -7 +7 @@
 
 /**
- * Adds necessary filters to use 'wp_template' posts instead of theme template files.
+ * Adds necessary hooks to resolve '_wp-find-template' requests.
  *
  * @access private
@@ -13 +13 @@
  */
 function _add_template_loader_filters() {
-    if ( ! current_theme_supports( 'block-templates' ) ) {
-        return;
-    }
-
-    $template_types = array_keys( get_default_block_template_types() );
-    foreach ( $template_types as $template_type ) {
-        // Skip 'embed' for now because it is not a regular template type.
-        if ( 'embed' === $template_type ) {
-            continue;
-        }
-        add_filter( str_replace( '-', '', $template_type ) . '_template', 'locate_block_template', 20, 3 );
-    }
-
-    // Request to resolve a template.
-    if ( isset( $_GET['_wp-find-template'] ) ) {
+    if ( isset( $_GET['_wp-find-template'] ) && current_theme_supports( 'block-templates' ) ) {
         add_action( 'pre_get_posts', '_resolve_template_for_new_post' );
     }