Ticket #39304: 39304.diff

src/wp-includes/media.php

@@ -3667 +3667 @@
  *               from the expanded shortcode.
  */
 function get_post_galleries( $post, $html = true ) {
         if ( ! $post = get_post( $post ) )
                 return array();
 
         if ( ! has_shortcode( $post->post_content, 'gallery' ) )
                 return array();
 
         $galleries = array();
         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();
 
+                                $shortcode_attrs = shortcode_parse_atts( $shortcode[3] );
+                                if ( ! is_array( $shortcode_attrs ) ) {
+                                        $shortcode_attrs = array();
+                                }
+
+                                // force-specify the post id of the gallery we want to view.
+                                if ( empty( $shortcode_atts['id'] ) ) {
+                                        $shortcode[3] .= ' id="' . $post->ID . '"';
+                                }
+
                                 $gallery = do_shortcode_tag( $shortcode );
                                 if ( $html ) {
                                         $galleries[] = $gallery;
                                 } else {
                                         preg_match_all( '#src=([\'"])(.+?)\1#is', $gallery, $src, PREG_SET_ORDER );
                                         if ( ! empty( $src ) ) {
                                                 foreach ( $src as $s )
                                                         $srcs[] = $s[2];
                                         }
 
-                                        $data = shortcode_parse_atts( $shortcode[3] );
-                                        $data['src'] = array_values( array_unique( $srcs ) );
-                                        $galleries[] = $data;
+                                        $shortcode_attrs['src'] = array_values( array_unique( $srcs ) );
+                                        $galleries[] = $shortcode_attrs;
                                 }
                         }
                 }
         }
 
         /**
          * Filters the list of all found galleries in the given post.
          *
          * @since 3.6.0
          *
          * @param array   $galleries Associative array of all found post galleries.
          * @param WP_Post $post      Post object.
          */
         return apply_filters( 'get_post_galleries', $galleries, $post );
 }