PR feedback, small updates, another case of the wrong ids.

Co-authored-by: Weston Ruter <[email protected]>

Author: dmsnell

src/wp-includes/media.php

@@ -5257,7 +5257,7 @@ function get_media_embedded_in_content( $content, $types = null ) {
 function get_post_galleries( $post, $html = true, $max_galleries = PHP_INT_MAX ) {
 	$post = get_post( $post );
 
-	if ( ! $post ) {
+	if ( ! ( $post instanceof WP_Post ) ) {
 		return array();
 	}
 
@@ -5269,7 +5269,7 @@ function get_post_galleries( $post, $html = true, $max_galleries = PHP_INT_MAX )
 	if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $post->post_content, $matches, PREG_SET_ORDER ) ) {
 		foreach ( $matches as $shortcode ) {
 			if ( 'gallery' === $shortcode[2] ) {
-				$srcs = array();
+				$sources = array();
 
 				$shortcode_attrs = shortcode_parse_atts( $shortcode[3] );
 
@@ -5285,14 +5285,14 @@ function get_post_galleries( $post, $html = true, $max_galleries = PHP_INT_MAX )
 					preg_match_all( '#src=([\'"])(.+?)\1#is', $gallery, $src, PREG_SET_ORDER );
 					if ( ! empty( $src ) ) {
 						foreach ( $src as $s ) {
-							$srcs[] = $s[2];
+							$sources[] = $s[2];
 						}
 					}
 
 					$galleries[] = array_merge(
 						$shortcode_attrs,
 						array(
-							'src' => array_values( array_unique( $srcs ) ),
+							'src' => array_values( array_unique( $sources ) ),
 						)
 					);
 				}
@@ -5311,32 +5311,29 @@ function get_post_galleries( $post, $html = true, $max_galleries = PHP_INT_MAX )
 		$has_inner_blocks = false;
 		$gallery_ids      = $processor->allocate_and_return_parsed_attributes()['ids'] ?? array();
 		$ids              = array();
-		$srcs             = array();
+		$sources          = array();
+		$inner_html       = array();
 
-		$html_chunks = array();
-		$top_chunks  = array();
 		while ( $processor->next_token() && $processor->get_depth() > $gallery_depth ) {
-			if ( $processor->is_html() ) {
-				$chunk_span    = $processor->get_span();
-				$chunk         = substr( $post->post_content, $chunk_span->start, $chunk_span->length );
-				$html_chunks[] = $chunk;
-				if ( $gallery_depth === $processor->get_depth() - 1 ) {
-					$top_chunks[] = $chunk;
-				}
-			} else {
+			if ( ! $processor->is_html() ) {
 				$has_inner_blocks = true;
 				break;
 			}
+
+			if ( $processor->get_depth() === $gallery_depth + 1 ) {
+				$inner_html[] = $processor->get_html_content();
+			}
 		}
 
 		// New Gallery block format as HTML.
 		if ( $has_inner_blocks && $html ) {
+			// Reset this, because the new format stores everything inside the inner blocks.
+			$html_chunks = array();
 
 			// Get the rest of the innerHTML of the Gallery’s direct children.
 			while ( $processor->next_token() && $processor->get_depth() > $gallery_depth ) {
 				if ( $processor->is_html() && $processor->get_depth() === $gallery_depth + 2 ) {
-					$chunk_span    = $processor->get_span();
-					$html_chunks[] = substr( $post->post_content, $chunk_span->start, $chunk_span->length );
+					$html_chunks[] = $processor->get_html_content();
 				}
 			}
 
@@ -5363,24 +5360,24 @@ function get_post_galleries( $post, $html = true, $max_galleries = PHP_INT_MAX )
 						$ids[] = $id;
 						$url   = wp_get_attachment_url( $id );
 
-						if ( is_string( $url ) && ! in_array( $url, $srcs, true ) ) {
-							$srcs[] = $url;
+						if ( is_string( $url ) && ! in_array( $url, $sources, true ) ) {
+							$sources[] = $url;
 						}
 					}
 				}
 			} while ( $processor->next_block() && $processor->get_depth() > $gallery_depth );
 
 			$galleries[] = array(
 				'ids' => implode( ',', $ids ),
-				'src' => $srcs,
+				'src' => $sources,
 			);
 
 			continue;
 		}
 
 		// Old Gallery block format as HTML.
 		if ( $html ) {
-			$galleries[] = implode( '', $top_chunks );
+			$galleries[] = implode( '', $inner_html );
 			continue;
 		}
 
@@ -5397,30 +5394,30 @@ function get_post_galleries( $post, $html = true, $max_galleries = PHP_INT_MAX )
 			foreach ( $gallery_ids as $id ) {
 				$url = wp_get_attachment_url( $id );
 
-				if ( is_string( $url ) && ! in_array( $url, $srcs, true ) ) {
-					$srcs[] = $url;
+				if ( is_string( $url ) && ! in_array( $url, $sources, true ) ) {
+					$sources[] = $url;
 				}
 			}
 
 			$galleries[] = array(
-				'ids' => implode( ',', $ids ),
-				'src' => $srcs,
+				'ids' => implode( ',', $gallery_ids ),
+				'src' => $sources,
 			);
 
 			continue;
 		}
 
 		// Otherwise, extract srcs from the innerHTML.
-		$inner_html = implode( '', $top_chunks );
+		$inner_html = implode( '', $inner_html );
 		$src_finder = new WP_HTML_Tag_Processor( $inner_html );
 		while ( $src_finder->next_tag() ) {
 			$src = $src_finder->get_attribute( 'src' );
-			if ( is_string( $src ) && ! in_array( $src, $srcs, true ) ) {
-				$srcs[] = $src;
+			if ( is_string( $src ) && ! in_array( $src, $sources, true ) ) {
+				$sources[] = $src;
 			}
 		}
 
-		$galleries[] = array( 'src' => $srcs );
+		$galleries[] = array( 'src' => $sources );
 	}
 
 	/**