HTML & Shortcode: Honor hide-everywhere visibility after support was disabled

t-hamano · t-hamano · commit 4fc9add8e806 · 2026-05-28T22:39:53.000+09:00
Blocks that previously supported visibility (HTML and Shortcode) silently reappear on the front end when content saved with `metadata.blockVisibility: false` is rendered after their support was disabled in #76138. Move the `block_has_support` check to run only for viewport-based visibility so the boolean `false` (hide everywhere) value continues to hide the block regardless of the block's current visibility support.
diff --git a/lib/block-supports/block-visibility.php b/lib/block-supports/block-visibility.php
@@ -15,16 +15,24 @@
 function gutenberg_render_block_visibility_support( $block_content, $block ) {
 	$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
 
-	if ( ! $block_type || ! block_has_support( $block_type, 'visibility', true ) ) {
+	if ( ! $block_type ) {
 		return $block_content;
 	}
 
 	$block_visibility = $block['attrs']['metadata']['blockVisibility'] ?? null;
 
+	// 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_visibility ) {
 		return '';
 	}
 
+	if ( ! block_has_support( $block_type, 'visibility', true ) ) {
+		return $block_content;
+	}
+
 	if ( is_array( $block_visibility ) && ! empty( $block_visibility ) ) {
 		// Get viewport configuration from nested structure.
 		$viewport_config = $block_visibility['viewport'] ?? null;
diff --git a/phpunit/block-supports/block-visibility-test.php b/phpunit/block-supports/block-visibility-test.php
@@ -93,7 +93,7 @@ public function test_block_visibility_support_hides_block_when_visibility_false(
 		$this->assertSame( '', $result, 'Block content should be empty when blockVisibility is false and support is opted in.' );
 	}
 
-	public function test_block_visibility_support_shows_block_when_support_not_opted_in() {
+	public function test_block_visibility_support_hides_block_when_visibility_false_even_without_support() {
 		$this->register_visibility_block_with_support(
 			'test/visibility-block',
 			array( 'visibility' => false )
@@ -111,7 +111,7 @@ public function test_block_visibility_support_shows_block_when_support_not_opted
 
 		$result = gutenberg_render_block_visibility_support( $block_content, $block );
 
-		$this->assertSame( $block_content, $result, 'Block content should remain unchanged when blockVisibility support is not opted in.' );
+		$this->assertSame( '', $result, 'Block content should be empty when blockVisibility is false, even without visibility support.' );
 	}
 
 	public function test_block_visibility_support_no_visibility_attribute() {

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function test_block_visibility_support_hides_block_when_visibility_false(`
`93`	`93`	`$this->assertSame( '', $result, 'Block content should be empty when blockVisibility is false and support is opted in.' );`
`94`	`94`	`}`
`95`	`95`
`96`		`- public function test_block_visibility_support_shows_block_when_support_not_opted_in() {`
	`96`	`+ public function test_block_visibility_support_hides_block_when_visibility_false_even_without_support() {`
`97`	`97`	`$this->register_visibility_block_with_support(`
`98`	`98`	`'test/visibility-block',`
`99`	`99`	`array( 'visibility' => false )`
`@@ -111,7 +111,7 @@ public function test_block_visibility_support_shows_block_when_support_not_opted`
`111`	`111`
`112`	`112`	`$result = gutenberg_render_block_visibility_support( $block_content, $block );`
`113`	`113`
`114`		`- $this->assertSame( $block_content, $result, 'Block content should remain unchanged when blockVisibility support is not opted in.' );`
	`114`	`+ $this->assertSame( '', $result, 'Block content should be empty when blockVisibility is false, even without visibility support.' );`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`public function test_block_visibility_support_no_visibility_attribute() {`