4.6.8.1 Release

all_in_one_seo_pack.php

@@ -5,7 +5,7 @@
  * Description: SEO for WordPress. Features like XML Sitemaps, SEO for custom post types, SEO for blogs, business sites, ecommerce sites, and much more. More than 100 million downloads since 2007.
  * Author:      All in One SEO Team
  * Author URI:  https://aioseo.com/
- * Version:     4.6.7
+ * Version:     4.6.8.1
  * Text Domain: all-in-one-seo-pack
  * Domain Path: /languages
  *

app/Common/Models/Post.php

@@ -646,6 +646,8 @@ public static function getDefaultSchemaOptions( $existingOptions = '', $post = n
 					'Movie'               => [],
 					'Person'              => [],
 					'Product'             => [],
+					'ProductReview'       => [],
+					'Car'                 => [],
 					'Recipe'              => [],
 					'Service'             => [],
 					'SoftwareApplication' => [],

app/Common/Sitemap/Image/ThirdParty.php

@@ -338,7 +338,7 @@ private function kadenceBlocks() {
 			return [];
 		}
 
-		$blocks = parse_blocks( $this->post->post_content );
+		$blocks = aioseo()->helpers->parseBlocks( $this->post );
 
 		foreach ( $blocks as $block ) {
 			if ( 'kadence/advancedgallery' === $block['blockName'] && ! empty( $block['attrs']['ids'] ) ) {

app/Common/Traits/Helpers/Wp.php

@@ -837,4 +837,65 @@ public function canRegisterLegacyWidget( $idBase ) {
 
 		return false;
 	}
+
+	/**
+	 * Parses blocks for a given post.
+	 *
+	 * @since 4.6.8
+	 *
+	 * @param  \WP_Post|int $post          The post or post ID.
+	 * @param  bool         $flattenBlocks Whether to flatten the blocks.
+	 * @return array                       The parsed blocks.
+	 */
+	public function parseBlocks( $post, $flattenBlocks = true ) {
+		if ( ! is_a( $post, 'WP_Post' ) ) {
+			$post = aioseo()->helpers->getPost( $post );
+		}
+
+		static $parsedBlocks = [];
+		if ( isset( $parsedBlocks[ $post->ID ] ) ) {
+			return $parsedBlocks[ $post->ID ];
+		}
+
+		$parsedBlocks = parse_blocks( $post->post_content );
+
+		if ( $flattenBlocks ) {
+			$parsedBlocks = $this->flattenBlocks( $parsedBlocks );
+		}
+
+		$parsedBlocks[ $post->ID ] = $parsedBlocks;
+
+		return $parsedBlocks[ $post->ID ];
+	}
+
+	/**
+	 * Flattens the given blocks.
+	 *
+	 * @since 4.6.8
+	 *
+	 * @param  array $blocks The blocks.
+	 * @return array         The flattened blocks.
+	 */
+	public function flattenBlocks( $blocks ) {
+		$flattenedBlocks = [];
+
+		foreach ( $blocks as $block ) {
+			if ( ! empty( $block['innerBlocks'] ) ) {
+				// Flatten inner blocks first.
+				$innerBlocks = $this->flattenBlocks( $block['innerBlocks'] );
+				unset( $block['innerBlocks'] );
+
+				// Add the current block to the result.
+				$flattenedBlocks[] = $block;
+
+				// Add the flattened inner blocks to the result.
+				$flattenedBlocks = array_merge( $flattenedBlocks, $innerBlocks );
+			} else {
+				// If no inner blocks, just add the block to the result.
+				$flattenedBlocks[] = $block;
+			}
+		}
+
+		return $flattenedBlocks;
+	}
 }