Ticket #42548: 42548.2.diff

src/wp-includes/media.php

@@ -1666 +1666 @@
         $atts = shortcode_atts( array(
                 'order'      => 'ASC',
                 'orderby'    => 'menu_order ID',
-                'id'         => $post ? $post->ID : 0,
+                'id'         => null,
                 'itemtag'    => $html5 ? 'figure'     : 'dl',
                 'icontag'    => $html5 ? 'div'        : 'dt',
                 'captiontag' => $html5 ? 'figcaption' : 'dd',
@@ -1676 +1676 @@
                 'exclude'    => '',
                 'link'       => ''
         ), $attr, 'gallery' );
+        
+        if ( null !== $atts['id'] ) {
+                $id = intval( $atts['id'] );
+        } else {
+                $id = $post ? intval( $post->ID ) : null;
+        }
 
-        $id = intval( $atts['id'] );
-
         if ( ! empty( $atts['include'] ) ) {
                 $_attachments = get_posts( array( 'include' => $atts['include'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
 
@@ -1686 +1690 @@
                 foreach ( $_attachments as $key => $val ) {
                         $attachments[$val->ID] = $_attachments[$key];
                 }
-        } elseif ( ! empty( $atts['exclude'] ) ) {
-                $attachments = get_children( array( 'post_parent' => $id, 'exclude' => $atts['exclude'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
-        } else {
-                $attachments = get_children( array( 'post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+        } elseif ( $id !== null  ) {
+                if ( ! empty( $atts['exclude'] ) ) {
+                        $attachments = get_children( array( 'post_parent' => $id, 'exclude' => $atts['exclude'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+                } else {
+                        $attachments = get_children( array( 'post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+                }
         }
 
         if ( empty( $attachments ) ) {