Changeset 62539

Timestamp:

06/22/2026 09:37:59 AM (7 weeks ago)

Author:

wildworks

Message:

Excerpt: Honor the block visibility metadata in generated excerpts.

When an excerpt is auto-generated, the metadata.blockVisibility attribute was ignored, so blocks marked as hidden still leaked their text into the excerpt even though they are not rendered on the front end.

Skip any block whose metadata.blockVisibility attribute is boolean false, for both top-level blocks and inner blocks.

Props n8finch, ramonopoly, wildworks.
Fixes #65456.

Location:

trunk

Files:

• src/wp-includes/blocks.php (modified) (2 diffs)
• tests/phpunit/tests/formatting/excerptRemoveBlocks.php (modified) (1 diff)

trunk/src/wp-includes/blocks.php

@@ -2239 +2239 @@
 
         foreach ( $blocks as $block ) {
+                // Hide the block whenever the value is boolean false, regardless of the
+                // block's current visibility support. This prevents blocks that previously
+                // supported visibility from unintentionally appearing on the front end
+                // after their support was disabled.
+                if ( false === ( $block['attrs']['metadata']['blockVisibility'] ?? null ) ) {
+                        continue;
+                }
+
                 if ( in_array( $block['blockName'], $allowed_blocks, true ) ) {
                         if ( ! empty( $block['innerBlocks'] ) ) {
@@ -2300 +2308 @@
 
         foreach ( $parsed_block['innerBlocks'] as $inner_block ) {
+                // Hide the block whenever the value is boolean false, regardless of the
+                // block's current visibility support. This prevents blocks that previously
+                // supported visibility from unintentionally appearing on the front end
+                // after their support was disabled.
+                if ( false === ( $inner_block['attrs']['metadata']['blockVisibility'] ?? null ) ) {
+                        continue;
+                }
+
                 if ( ! in_array( $inner_block['blockName'], $allowed_blocks, true ) ) {
                         continue;

trunk/tests/phpunit/tests/formatting/excerptRemoveBlocks.php

@@ -130 +130 @@
                 $this->assertEmpty( do_blocks( '<!-- wp:core/fake /-->' ) );
         }
+
+        /**
+         * Tests that a top-level block hidden via the visibility block support
+         * is removed from the excerpt.
+         *
+         * @ticket 65456
+         */
+        public function test_excerpt_remove_blocks_skips_hidden_block() {
+                $content = '<!-- wp:paragraph {"metadata":{"blockVisibility":false}} -->
+<p>hidden</p>
+<!-- /wp:paragraph -->
+<!-- wp:paragraph --><p>visible</p><!-- /wp:paragraph -->';
+
+                $output = excerpt_remove_blocks( $content );
+
+                $this->assertStringNotContainsString( 'hidden', $output );
+                $this->assertStringContainsString( 'visible', $output );
+        }
+
+        /**
+         * Tests that a hidden wrapper block (group/columns/column) is removed
+         * from the excerpt, including its inner blocks.
+         *
+         * @ticket 65456
+         *
+         * @covers ::_excerpt_render_inner_blocks
+         */
+        public function test_excerpt_remove_blocks_skips_hidden_wrapper_block() {
+                $content = '<!-- wp:group {"metadata":{"blockVisibility":false}} -->
+<div class="wp-block-group">
+<!-- wp:paragraph --><p>hidden inside group</p><!-- /wp:paragraph -->
+</div>
+<!-- /wp:group -->
+<!-- wp:paragraph --><p>visible</p><!-- /wp:paragraph -->';
+
+                $output = excerpt_remove_blocks( $content );
+
+                $this->assertStringNotContainsString( 'hidden inside group', $output );
+                $this->assertStringContainsString( 'visible', $output );
+        }
+
+        /**
+         * Tests that a hidden block nested inside a visible wrapper is removed.
+         *
+         * @ticket 65456
+         *
+         * @covers ::_excerpt_render_inner_blocks
+         */
+        public function test_excerpt_remove_blocks_skips_hidden_inner_block() {
+                $content = '<!-- wp:group -->
+<div class="wp-block-group">
+<!-- wp:paragraph {"metadata":{"blockVisibility":false}} --><p>hidden inner</p><!-- /wp:paragraph -->
+<!-- wp:paragraph --><p>visible inner</p><!-- /wp:paragraph -->
+</div>
+<!-- /wp:group -->';
+
+                $output = excerpt_remove_blocks( $content );
+
+                $this->assertStringNotContainsString( 'hidden inner', $output );
+                $this->assertStringContainsString( 'visible inner', $output );
+        }
+
+        /**
+         * Tests that a block hidden only on a specific viewport is kept in the
+         * excerpt. Viewport visibility only affects the rendered display via CSS,
+         * so it must not strip the block's text from the excerpt.
+         *
+         * @ticket 65456
+         */
+        public function test_excerpt_remove_blocks_keeps_viewport_hidden_block() {
+                $content = '<!-- wp:paragraph {"metadata":{"blockVisibility":{"viewport":{"desktop":false}}}} -->
+<p>Hello World</p>
+<!-- /wp:paragraph -->';
+
+                $output = excerpt_remove_blocks( $content );
+
+                $this->assertStringContainsString( 'Hello World', $output );
+        }
 }