Changeset 51382 for branches/5.8/tests/phpunit/tests/post/getTheExcerpt.php

Timestamp:

07/08/2021 05:27:27 PM (4 years ago)

Author:

jorbin

Message:

Posts: Prevent an empty excerpt when groups and nested column blocks are present.

This improves the logic within excerpt_remove_blocks() to better handle innerBlocks. This prevents an empty excerpt from being returned when core/columns, core/column, and core/group blocks are present.

This issue has been surfaced in the Query Loop block, where excerpts can be set to display.

This introduces the excerpt_allowed_wrapper_blocks filter for controlling which blocks should be considered wrapper blocks.

Wrapper blocks and their nested contents are not stripped by excerpt_remove_blocks(), allowing their contents to appear in generated excerpts.

Backports [51348], [51375], [51378], and [51379] to the 5.8 branch.

Fixes #53604.
Props aristath, jorbin, SergeyBiryukov, desrosj.
Unprops jorbin.

Location:

branches/5.8

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/post/getTheExcerpt.php (modified) (1 diff)

branches/5.8/tests/phpunit/tests/post/getTheExcerpt.php

@@ -146 +146 @@
         $this->assertSame( 'Bar', $found );
     }
+
+    /**
+     * @ticket 53604
+     */
+    public function test_inner_blocks_excerpt() {
+        $content_1 = '<!-- wp:group -->
+<div class="wp-block-group"><!-- wp:columns -->
+<div class="wp-block-columns"><!-- wp:column -->
+<div class="wp-block-column"><!-- wp:paragraph -->
+<p>Column 1</p>
+<!-- /wp:paragraph --></div>
+<!-- /wp:column -->
+
+<!-- wp:column -->
+<div class="wp-block-column"><!-- wp:paragraph -->
+<p>Column 2</p>
+<!-- /wp:paragraph --></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns --></div>
+<!-- /wp:group -->
+
+<!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph -->';
+
+        $content_2 = '<!-- wp:group -->
+<div class="wp-block-group"><!-- wp:paragraph -->
+<p>Paragraph inside group block</p>
+<!-- /wp:paragraph --></div>
+<!-- /wp:group -->
+
+<!-- wp:paragraph -->
+<p></p>
+<!-- /wp:paragraph -->';
+
+        $post_1 = self::factory()->post->create_and_get(
+            array(
+                'post_content' => $content_1,
+                'post_excerpt' => '',
+            )
+        );
+
+        $post_2 = self::factory()->post->create_and_get(
+            array(
+                'post_content' => $content_2,
+                'post_excerpt' => '',
+            )
+        );
+
+        $this->assertSame(
+            'Column 1 Column 2',
+            get_the_excerpt( ( new WP_Query( array( 'p' => $post_1->ID ) ) )->posts[0] )
+        );
+
+        $this->assertSame(
+            'Paragraph inside group block',
+            get_the_excerpt( ( new WP_Query( array( 'p' => $post_2->ID ) ) )->posts[0] )
+        );
+    }
 }