Ticket #43826: 43826.2.diff

src/wp-includes/media.php

@@ -3765 +3765 @@
         if ( ! $post = get_post( $post ) )
                 return array();
 
-        if ( ! has_shortcode( $post->post_content, 'gallery' ) )
+        if ( ! has_shortcode( $post->post_content, 'gallery' ) && !has_block( 'gallery', $post->post_content ) )
                 return array();
 
         $galleries = array();
@@ -3806 +3806 @@
                 }
         }
 
+        if ( has_block( 'gallery', $post->post_content ) ) {
+                $post_blocks = parse_blocks( $post->post_content );
+                // Use while/array_shift instead of foreach so we can modify the array from within the loop
+                while ( $block = array_shift( $post_blocks ) ) {
+                        if ( 'core/gallery' === $block['blockName'] ) {
+                                if ( $html ) {
+                                        $galleries[] = $block['innerHTML'];
+                                } else {
+                                        $srcs = array();
+                                        preg_match_all( '#src=([\'"])(.+?)\1#is', $block['innerHTML'], $src, PREG_SET_ORDER );
+                                        if ( ! empty( $src ) ) {
+                                                foreach ( $src as $s ) {
+                                                        $srcs[] = $s[2];
+                                                }
+                                        }
+
+                                        $galleries[] = array(
+                                                // Note that unlike shortcodes, all we are returning here is the src list
+                                                'src' => array_values( array_unique( $srcs ) )
+                                        );
+                                }
+
+                        } elseif ( !empty( $block['innerBlocks'] ) ) {
+                                // If we have nested blocks then gradually flatten it by moving those onto the end of the root array for traversal
+                                while ( $inner = array_pop( $block['innerBlocks'] ) ) {
+                                        array_push( $post_blocks, $inner );
+                                }
+                        }
+                }
+        }
+
         /**
          * Filters the list of all found galleries in the given post.
          *

tests/phpunit/tests/media.php

@@ -604 +604 @@
                 $this->assertEquals( $srcs, $ids1_srcs );
         }
 
+        /**
+         * @ticket 43826
+         */
+        function test_block_post_galleries() {
+                // Set up an unattached image.
+                $this->factory->attachment->create_object( array(
+                        'file' => 'test.jpg',
+                        'post_parent' => 0,
+                        'post_mime_type' => 'image/jpeg',
+                        'post_type' => 'attachment'
+                ) );
+
+                $post_id = $this->factory->post->create( array(
+                        'post_content' => '<!-- wp:gallery -->',
+                ) );
+
+                $galleries = get_post_galleries( $post_id, false );
+
+                $this->assertTrue( is_array( $galleries ) );
+                $this->assertEmpty( $galleries[0]['src'] );
+        }
+
+        /**
+         * @ticket 43826
+         */
+        function test_block_post_gallery_images() {
+                // Similar to test_post_gallery_images but with blocks instead of shortcodes
+                $ids1 = array();
+                $imgs1 = array();
+                $ids1_srcs = array();
+                foreach ( range( 1, 3 ) as $i ) {
+                        $attachment_id = self::factory()->attachment->create_object( "image$i.jpg", 0, array(
+                                'post_mime_type' => 'image/jpeg',
+                                'post_type' => 'attachment'
+                        ) );
+                        $metadata = array_merge( array( "file" => "image$i.jpg" ), $this->img_meta );
+                        wp_update_attachment_metadata( $attachment_id, $metadata );
+                        $ids1[] = $attachment_id;
+                        $url = $ids1_srcs[] = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . "image$i.jpg";
+                        $imgs1[] = '<figure><img src="' . $url . '" data-id="' . $i . '" /></figure>';
+
+                }
+
+                $ids2 = array();
+                $imgs2 = array();
+                $ids2_srcs = array();
+                foreach ( range( 4, 6 ) as $i ) {
+                        $attachment_id = self::factory()->attachment->create_object( "image$i.jpg", 0, array(
+                                'post_mime_type' => 'image/jpeg',
+                                'post_type' => 'attachment'
+                        ) );
+                        $metadata = array_merge( array( "file" => "image$i.jpg" ), $this->img_meta );
+                        wp_update_attachment_metadata( $attachment_id, $metadata );
+                        $ids2[] = $attachment_id;
+                        $url = $ids2_srcs[] = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . "image$i.jpg";
+                        $imgs2[] = '<figure><img src="' . $url . '" data-id="' . $i . '" /></figure>';
+                }
+
+                $imgs1_joined = join( "\n", $imgs1 );
+                $imgs2_joined = join( "\n", $imgs2 );
+
+                $blob =<<<BLOB
+<!-- wp:gallery -->
+$imgs1_joined
+<!-- /wp:gallery -->
+
+<!-- wp:gallery -->
+$imgs2_joined
+<!-- /wp:gallery -->
+BLOB;
+                $post_id = self::factory()->post->create( array( 'post_content' => $blob ) );
+                $srcs = get_post_gallery_images( $post_id );
+                $this->assertEquals( $srcs, $ids1_srcs );
+        }
+
+        /**
+         * @ticket 43826
+         */
+        function test_block_inner_post_gallery_images() {
+                // Make sure get_post_gallery_images() works with gallery blocks that are nested inside something else
+                $ids1 = array();
+                $imgs1 = array();
+                $ids1_srcs = array();
+                foreach ( range( 1, 3 ) as $i ) {
+                        $attachment_id = self::factory()->attachment->create_object( "image$i.jpg", 0, array(
+                                'post_mime_type' => 'image/jpeg',
+                                'post_type' => 'attachment'
+                        ) );
+                        $metadata = array_merge( array( "file" => "image$i.jpg" ), $this->img_meta );
+                        wp_update_attachment_metadata( $attachment_id, $metadata );
+                        $ids1[] = $attachment_id;
+                        $url = $ids1_srcs[] = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . "image$i.jpg";
+                        $imgs1[] = '<figure><img src="' . $url . '" data-id="' . $i . '" /></figure>';
+
+                }
+
+                $imgs1_joined = join( "\n", $imgs1 );
+
+                $blob =<<<BLOB
+<!-- wp:columns -->
+<!-- wp:column -->
+<!-- wp:gallery -->
+$imgs1_joined
+<!-- /wp:gallery -->
+<!-- /wp:column -->
+<!-- /wp:columns -->
+BLOB;
+                $post_id = self::factory()->post->create( array( 'post_content' => $blob ) );
+                $srcs = get_post_gallery_images( $post_id );
+                $this->assertEquals( $srcs, $ids1_srcs );
+        }
+
         function test_get_media_embedded_in_content() {
                 $object =<<<OBJ
 <object src="this" data="that">