WordPress.org

Make WordPress Core

Changeset 51348


Ignore:
Timestamp:
07/06/2021 03:31:48 PM (3 months ago)
Author:
desrosj
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.

Props aristath.
Fixes #53604.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/blocks.php

    r51298 r51348  
    711711    );
    712712
    713     $allowed_blocks = array_merge( $allowed_inner_blocks, array( 'core/columns' ) );
     713    $allowed_wrapper_blocks = array(
     714        'core/columns',
     715        'core/column',
     716        'core/group',
     717    );
     718
     719    $allowed_blocks = array_merge( $allowed_inner_blocks, $allowed_wrapper_blocks );
    714720
    715721    /**
     
    730736        if ( in_array( $block['blockName'], $allowed_blocks, true ) ) {
    731737            if ( ! empty( $block['innerBlocks'] ) ) {
    732                 if ( 'core/columns' === $block['blockName'] ) {
    733                     $output .= _excerpt_render_inner_columns_blocks( $block, $allowed_inner_blocks );
     738                if ( in_array( $block['blockName'], $allowed_wrapper_blocks, true ) ) {
     739                    $output .= _excerpt_render_inner_blocks( $block, $allowed_blocks );
    734740                    continue;
    735741                }
     
    754760
    755761/**
    756  * Render inner blocks from the `core/columns` block for generating an excerpt.
    757  *
    758  * @since 5.2.0
     762 * Render inner blocks from the allowed wrapper blocks
     763 * for generating an excerpt.
     764 *
     765 * @since 5.8
    759766 * @access private
    760767 *
    761  * @param array $columns        The parsed columns block.
     768 * @param array $parsed_block   The parsed block.
    762769 * @param array $allowed_blocks The list of allowed inner blocks.
    763770 * @return string The rendered inner blocks.
    764771 */
    765 function _excerpt_render_inner_columns_blocks( $columns, $allowed_blocks ) {
     772function _excerpt_render_inner_blocks( $parsed_block, $allowed_blocks ) {
    766773    $output = '';
    767774
    768     foreach ( $columns['innerBlocks'] as $column ) {
    769         foreach ( $column['innerBlocks'] as $inner_block ) {
    770             if ( in_array( $inner_block['blockName'], $allowed_blocks, true ) && empty( $inner_block['innerBlocks'] ) ) {
    771                 $output .= render_block( $inner_block );
    772             }
     775    foreach ( $parsed_block['innerBlocks'] as $inner_block ) {
     776        if ( ! in_array( $inner_block['blockName'], $allowed_blocks, true ) ) {
     777            continue;
     778        }
     779
     780        if ( empty( $inner_block['innerBlocks'] ) ) {
     781            $output .= render_block( $inner_block );
     782        } else {
     783            $output .= _excerpt_render_inner_blocks( $inner_block, $allowed_blocks );
    773784        }
    774785    }
  • trunk/src/wp-includes/deprecated.php

    r50810 r51348  
    42084208    wp_strict_cross_origin_referrer();
    42094209}
     4210
     4211/**
     4212 * Render inner blocks from the `core/columns` block for generating an excerpt.
     4213 *
     4214 * @since 5.2.0
     4215 * @deprecated 5.8.0
     4216 *
     4217 * @access private
     4218 *
     4219 * @param array $columns        The parsed columns block.
     4220 * @param array $allowed_blocks The list of allowed inner blocks.
     4221 * @return string The rendered inner blocks.
     4222 */
     4223function _excerpt_render_inner_columns_blocks( $columns, $allowed_blocks ) {
     4224    _deprecated_function( __FUNCTION__, '5.8.0', '_excerpt_render_inner_blocks()' );
     4225    return _excerpt_render_inner_blocks( $columns, $allowed_blocks );
     4226}
  • trunk/tests/phpunit/tests/post/getTheExcerpt.php

    r46586 r51348  
    146146        $this->assertSame( 'Bar', $found );
    147147    }
     148
     149    /**
     150     * @ticket 53604
     151     */
     152    public function test_inner_blocks_excerpt() {
     153        $content_1 = '<!-- wp:group -->
     154<div class="wp-block-group"><!-- wp:columns -->
     155<div class="wp-block-columns"><!-- wp:column -->
     156<div class="wp-block-column"><!-- wp:paragraph -->
     157<p>Column 1</p>
     158<!-- /wp:paragraph --></div>
     159<!-- /wp:column -->
     160
     161<!-- wp:column -->
     162<div class="wp-block-column"><!-- wp:paragraph -->
     163<p>Column 2</p>
     164<!-- /wp:paragraph --></div>
     165<!-- /wp:column --></div>
     166<!-- /wp:columns --></div>
     167<!-- /wp:group -->
     168
     169<!-- wp:paragraph -->
     170<p></p>
     171<!-- /wp:paragraph -->';
     172
     173        $content_2 = '<!-- wp:group -->
     174<div class="wp-block-group"><!-- wp:paragraph -->
     175<p>Paragraph inside group block</p>
     176<!-- /wp:paragraph --></div>
     177<!-- /wp:group -->
     178
     179<!-- wp:paragraph -->
     180<p></p>
     181<!-- /wp:paragraph -->';
     182
     183        $post_1 = self::factory()->post->create_and_get(
     184            array(
     185                'post_content' => $content_1,
     186                'post_excerpt' => '',
     187            )
     188        );
     189
     190        $post_2 = self::factory()->post->create_and_get(
     191            array(
     192                'post_content' => $content_2,
     193                'post_excerpt' => '',
     194            )
     195        );
     196
     197        $this->assertSame(
     198            'Column 1 Column 2',
     199            get_the_excerpt( ( new WP_Query( array( 'p' => $post_1->ID ) ) )->posts[0] )
     200        );
     201
     202        $this->assertSame(
     203            'Paragraph inside group block',
     204            get_the_excerpt( ( new WP_Query( array( 'p' => $post_2->ID ) ) )->posts[0] )
     205        );
     206    }
    148207}
Note: See TracChangeset for help on using the changeset viewer.