Editor: Always hide blocks with visibility set to false.

After a block stopped supporting visibility, a block that had been set to hide everywhere would show up again on the front end. 

The check is now reordered, so a block set to hide everywhere stays hidden, whether or not the block still supports visibility.

Props masteradhoc, ramonopoly, tusharaddweb wildworks.
Fixes #65389.


git-svn-id: https://develop.svn.wordpress.org/trunk@62586 602fd350-edb4-49c9-b593-d223f7449a82

Author: t-hamano

src/wp-includes/block-supports/block-visibility.php

@@ -20,16 +20,24 @@
 function wp_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 ) ) {
 		$viewport_config = $block_visibility['viewport'] ?? null;
 

tests/phpunit/tests/block-supports/block-visibility.php

@@ -80,12 +80,13 @@ public function test_block_visibility_support_hides_block_when_visibility_false(
 	}
 
 	/**
-	 * Tests that block visibility support renders block normally when visibility is false
-	 * but blockVisibility support is not opted in.
+	 * Tests that block visibility support hides the block when visibility is false
+	 * even when blockVisibility support is not opted in.
 	 *
 	 * @ticket 64061
+	 * @ticket 65389
 	 */
-	public function test_block_visibility_support_shows_block_when_support_not_opted_in(): void {
+	public function test_block_visibility_support_hides_block_when_visibility_false_even_without_support(): void {
 		$this->register_visibility_block_with_support(
 			'test/visibility-block',
 			array( 'visibility' => false )
@@ -103,7 +104,7 @@ public function test_block_visibility_support_shows_block_when_support_not_opted
 
 		$result = wp_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.' );
 	}
 
 	/**