Changeset 40070 for trunk/src/wp-includes/media.php

Timestamp:

02/17/2017 06:45:31 AM (9 years ago)

Author:

dd32

Message:

Media: Avoid PHP Warnings in get_post_galleries() when processing empty [gallery] shortcodes and avoid returning the incorrect results when the global $post does not match the provided post ID.

Props dd32, joemcgill, seanchayes.
Fixes #39277, #39304.

File:

• trunk/src/wp-includes/media.php (modified) (2 diffs)

trunk/src/wp-includes/media.php

@@ -3682 +3682 @@
                 $srcs = array();
 
+                $shortcode_attrs = shortcode_parse_atts( $shortcode[3] ); 
+                if ( ! is_array( $shortcode_attrs ) ) {
+                    $shortcode_attrs = array();
+                }
+
+                // Specify the post id of the gallery we're viewing if the shortcode doesn't reference another post already.
+                if ( ! isset( $shortcode_attrs['id'] ) ) {
+                    $shortcode[3] .= ' id="' . intval( $post->ID ) . '"';
+                }
+
                 $gallery = do_shortcode_tag( $shortcode );
                 if ( $html ) {
@@ -3688 +3698 @@
                     preg_match_all( '#src=([\'"])(.+?)\1#is', $gallery, $src, PREG_SET_ORDER );
                     if ( ! empty( $src ) ) {
-                        foreach ( $src as $s )
+                        foreach ( $src as $s ) {
                             $srcs[] = $s[2];
+                        }
                     }
 
-                    $data = shortcode_parse_atts( $shortcode[3] );
-                    $data['src'] = array_values( array_unique( $srcs ) );
-                    $galleries[] = $data;
+                    $galleries[] = array_merge(
+                        $shortcode_attrs,
+                        array(
+                            'src' => array_values( array_unique( $srcs ) )
+                        )
+                    );
                 }
             }