Ticket #21082: 21082.2.diff

wp-includes/media.php

@@ -748 +748 @@
         $itemwidth = $columns > 0 ? floor(100/$columns) : 100;
         $float = is_rtl() ? 'right' : 'left';
 
-        $selector = "gallery-{$instance}";
+        $selector = "gallery-{$id}-{$instance}";
 
         $gallery_style = $gallery_div = '';
-        if ( apply_filters( 'use_default_gallery_style', true ) )
+        
+        if ( apply_filters( 'use_default_gallery_style', true ) ) {
+
                 $gallery_style = "
                 <style type='text/css'>
-                        #{$selector} {
+                        #{$selector} .gallery-item {
+                                width: {$itemwidth}%;
+                        }
+                </style>
+                <!-- see gallery_shortcode() in wp-includes/media.php -->";
+
+                //check if this is the first instance and add general styles
+                if( 1 == $instance ) {
+                        $general_gallery_style = "
+                <style type='text/css'>
+                        .gallery {
                                 margin: auto;
                         }
-                        #{$selector} .gallery-item {
+                        .gallery .gallery-item {
                                 float: {$float};
                                 margin-top: 10px;
                                 text-align: center;
-                                width: {$itemwidth}%;
                         }
-                        #{$selector} img {
+                        .gallery img {
                                 border: 2px solid #cfcfcf;
                         }
-                        #{$selector} .gallery-caption {
+                        .gallery .gallery-caption {
                                 margin-left: 0;
                         }
-                </style>
-                <!-- see gallery_shortcode() in wp-includes/media.php -->";
+                </style>";
+                        $gallery_style .= $general_gallery_style;
+                }
+        }
+
         $size_class = sanitize_html_class( $size );
         $gallery_div = "<div id='$selector' class='gallery galleryid-{$id} gallery-columns-{$columns} gallery-size-{$size_class}'>";
         $output = apply_filters( 'gallery_style', $gallery_style . "\n\t\t" . $gallery_div );