Changeset 57020 for branches/6.4/src/wp-includes/block-template.php

Timestamp:

10/27/2023 06:34:11 PM (12 months ago)

Author:

flixos90

Message:

Themes: Skip wrapping block template for singular content with a main query loop when the template was injected from outside the current theme.

As a follow up to [56507], this fixes a bug that could occur for instance when plugins hijack the block template detection process to inject their own block template with entirely custom logic.

Props afragen, hellofromTonya, costdev, mukesh27, huzaifaalmesbah, flixos90.
Merges [57019] to the 6.4 branch.
Fixes #59736.
See #58154.

Location:

branches/6.4

Files:

• . (modified) (1 prop)
• src/wp-includes/block-template.php (modified) (3 diffs)

branches/6.4/src/wp-includes/block-template.php

@@ -209 +209 @@
  * @since 5.8.0
  *
+ * @global string   $_wp_current_template_id
  * @global string   $_wp_current_template_content
  * @global WP_Embed $wp_embed
@@ -216 +217 @@
  */
 function get_the_block_template_html() {
-    global $_wp_current_template_content, $wp_embed, $wp_query;
+    global $_wp_current_template_id, $_wp_current_template_content, $wp_embed, $wp_query;
 
     if ( ! $_wp_current_template_content ) {
@@ -243 +244 @@
      * loop, it would not cause errors since it would use a cloned instance and go through the same loop of a single
      * post, within the actual main query loop.
+     *
+     * This special logic should be skipped if the current template does not come from the current theme, in which case
+     * it has been injected by a plugin by hijacking the block template loader mechanism. In that case, entirely custom
+     * logic may be applied which is unpredictable and therefore safer to omit this special handling on.
      */
-    if ( is_singular() && 1 === $wp_query->post_count && have_posts() ) {
+    if (
+        $_wp_current_template_id &&
+        str_starts_with( $_wp_current_template_id, get_stylesheet() . '//' ) &&
+        is_singular() &&
+        1 === $wp_query->post_count &&
+        have_posts()
+    ) {
         while ( have_posts() ) {
             the_post();