Ticket #39304: 39304.1.diff

src/wp-includes/media.php

@@ -3681 +3681 @@
                         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_attrs['id'] ) ) {
+                                        $shortcode[3] .= ' id="' . $post->ID . '"';
+                                }
+
                                 $gallery = do_shortcode_tag( $shortcode );
                                 if ( $html ) {
                                         $galleries[] = $gallery;
@@ -3691 +3701 @@
                                                         $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;
                                 }
                         }
                 }

src/wp-includes/vars.php

@@ -28 +28 @@
                 preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
         else
                 preg_match('#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
-        $pagenow = $self_matches[1];
+        array_key_exists( 1, $self_matches ) ? $pagenow = $self_matches[1] : '';
+//      $pagenow = $self_matches[1];
         $pagenow = trim($pagenow, '/');
         $pagenow = preg_replace('#\?.*?$#', '', $pagenow);
         if ( '' === $pagenow || 'index' === $pagenow || 'index.php' === $pagenow ) {