Ticket #7678: 7678_combined.diff

wp-includes/media.php

@@ -610 +610 @@
  */
 function gallery_shortcode($attr) {
         global $post;
+        
+        static $instance = 0;
+        $instance++;
 
         // Allow plugins/themes to override the default gallery template.
         $output = apply_filters('post_gallery', '', $attr);
@@ -651 +654 @@
         $captiontag = tag_escape($captiontag);
         $columns = intval($columns);
         $itemwidth = $columns > 0 ? floor(100/$columns) : 100;
+        
+        $selector = "gallery-{$instance}";
 
         $output = apply_filters('gallery_style', "
                 <style type='text/css'>
-                        .gallery {
+                        #{$selector} {
                                 margin: auto;
                         }
-                        .gallery-item {
+                        #{$selector} .gallery-item {
                                 float: left;
                                 margin-top: 10px;
                                 text-align: center;
                                 width: {$itemwidth}%;                   }
-                        .gallery img {
+                        #{$selector} img {
                                 border: 2px solid #cfcfcf;
                         }
-                        .gallery-caption {
+                        #{$selector} .gallery-caption {
                                 margin-left: 0;
                         }
                 </style>
                 <!-- see gallery_shortcode() in wp-includes/media.php -->
-                <div class='gallery'>");
+                <div id='$selector' class='gallery galleryid-{$id}'>");
 
         $i = 0;
         foreach ( $attachments as $id => $attachment ) {