Merge pull request #836 from greenpeace/fix/block-report-all-allowed

Fix block report when all blocks are allowed
greenpeace · Apr 22, 2022 · 01fd572 · 01fd572
2 parents d20a24e + 0aa19da
commit 01fd572
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/classes/search/block/class-blockusagetable.php b/classes/search/block/class-blockusagetable.php
@@ -224,10 +224,11 @@ private function set_allowed_blocks() {
 			$context = new \WP_Block_Editor_Context(
 				[ 'post' => (object) [ 'post_type' => $type ] ]
 			);
-			$allowed = array_merge(
-				$allowed,
-				array_values( get_allowed_block_types( $context ) )
-			);
+			$on_type = get_allowed_block_types( $context );
+			if ( ! is_array( $on_type ) ) {
+				$on_type = $on_type ? $this->blocks_registered : [];
+			}
+			$allowed = array_merge( $allowed, array_values( $on_type ) );
 		}
 
 		$allowed = array_unique( $allowed );