Changeset 57020 for branches/6.4/tests/phpunit/tests/media.php

Timestamp:

10/27/2023 06:34:11 PM (11 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)
• tests/phpunit/tests/media.php (modified) (7 diffs)

branches/6.4/tests/phpunit/tests/media.php

@@ -80 +80 @@
      */
     public function tear_down() {
+        global $_wp_current_template_id, $_wp_current_template_content;
+        unset( $_wp_current_template_id, $_wp_current_template_content );
+
         parent::tear_down();
 
@@ -3973 +3976 @@
      */
     public function test_wp_filter_content_tags_does_not_lazy_load_first_image_in_block_theme() {
-        global $_wp_current_template_content, $wp_query, $wp_the_query, $post;
+        global $_wp_current_template_id, $_wp_current_template_content, $wp_query, $wp_the_query, $post;
 
         // Do not add srcset, sizes, or decoding attributes as they are irrelevant for this test.
@@ -4002 +4005 @@
         $post         = get_post( self::$post_ids['publish'] );
 
+        // Force a template ID that is for the current stylesheet.
+        $_wp_current_template_id      = get_stylesheet() . '//single';
         $_wp_current_template_content = '<!-- wp:post-content /-->';
 
@@ -4021 +4026 @@
      */
     public function test_wp_filter_content_tags_does_not_lazy_load_first_featured_image_in_block_theme() {
-        global $_wp_current_template_content, $wp_query, $wp_the_query, $post;
+        global $_wp_current_template_id, $_wp_current_template_content, $wp_query, $wp_the_query, $post;
 
         // Do not add srcset, sizes, or decoding attributes as they are irrelevant for this test.
@@ -4070 +4075 @@
         $post         = get_post( self::$post_ids['publish'] );
 
+        // Force a template ID that is for the current stylesheet.
+        $_wp_current_template_id      = get_stylesheet() . '//single';
         $_wp_current_template_content = '<!-- wp:post-featured-image /--> <!-- wp:post-content /-->';
 
@@ -4088 +4095 @@
      */
     public function test_wp_filter_content_tags_does_not_lazy_load_images_in_header() {
-        global $_wp_current_template_content;
+        global $_wp_current_template_id, $_wp_current_template_content;
 
         // Do not add srcset, sizes, or decoding attributes as they are irrelevant for this test.
@@ -4123 +4130 @@
         wp_set_post_terms( $footer_post_id, get_stylesheet(), 'wp_theme' );
 
+        // Force a template ID that is for the current stylesheet.
+        $_wp_current_template_id      = get_stylesheet() . '//single';
         $_wp_current_template_content = '<!-- wp:template-part {"slug":"header","theme":"' . get_stylesheet() . '","tagName":"header"} /--><!-- wp:template-part {"slug":"footer","theme":"' . get_stylesheet() . '","tagName":"footer"} /-->';