fix: core-query bug cleanup

Author: justlevine

includes/Data/ContentBlocksResolver.php

@@ -141,7 +141,7 @@ private static function handle_do_blocks( array $blocks ): array {
 		foreach ( $blocks as $block ) {
 			$block_data = self::handle_do_block( $block );
 
-			if ( $block_data ) {
+			if ( ! empty( $block_data ) ) {
 				$parsed[] = $block_data;
 			}
 		}
@@ -326,7 +326,6 @@ private static function populate_pattern_inner_blocks( array $block ): array {
 		return $block;
 	}
 
-
 	/**
 	 * Flattens a list blocks into a single array
 	 *

includes/Model/Block.php

@@ -9,7 +9,6 @@
 
 namespace WPGraphQL\ContentBlocks\Model;
 
-use WPGraphQL\ContentBlocks\Data\BlockAttributeResolver;
 use WPGraphQL\ContentBlocks\Utilities\WPGraphQLHelpers;
 use WPGraphQL\Model\Model;
 
@@ -107,8 +106,7 @@ protected function init() {
 	 */
 	protected function get_rendered_block(): ?string {
 		if ( ! isset( $this->rendered_block ) ) {
-			$rendered             = $this->data->render();
-			$this->rendered_block = do_shortcode( $rendered );
+			$this->rendered_block = ! empty( $this->data->parsed_block ) ? render_block( $this->data->parsed_block ) : '';
 		}
 
 		return $this->rendered_block;

includes/Registry/Registry.php

@@ -66,9 +66,9 @@ public function __construct( TypeRegistry $type_registry, $block_type_registry )
 	 * Registry init procedure.
 	 */
 	public function init(): void {
-		$this->register_interface_types();
 		$this->register_scalar_types();
 		$this->register_support_block_types();
+		$this->register_interface_types();
 		$this->register_block_types();
 	}
 
@@ -200,16 +200,17 @@ public function get_block_attributes_interfaces( string $block_name ): array {
 		}
 
 		$block_interfaces = [];
-	
+
 		$block_support_classes = $this->get_block_supports_classes();
 
 		foreach ( $block_support_classes as $instance ) {
 			$interfaces_to_add = $instance::get_attributes_interfaces( $block_spec );
+
 			if ( empty( $interfaces_to_add ) ) {
 				continue;
 			}
 
-			$block_interfaces[] = array_merge( $block_interfaces, $interfaces_to_add );
+			$block_interfaces = array_merge( $block_interfaces, $interfaces_to_add );
 		}
 
 		// NOTE: Using add_filter here creates a performance penalty.