Changeset 11339

Timestamp:

05/15/2009 08:52:04 AM (17 years ago)

Author:

azaozz

Message:

Support more than one gallery on the same page, props jamescollins, fixes #7678

File:

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

trunk/wp-includes/media.php

@@ -611 +611 @@
 function gallery_shortcode($attr) {
         global $post;
+        
+        static $instance = 0;
+        $instance++;
 
         // Allow plugins/themes to override the default gallery template.
@@ -643 +646 @@
         if ( is_feed() ) {
                 $output = "\n";
-                foreach ( $attachments as $id => $attachment )
-                        $output .= wp_get_attachment_link($id, $size, true) . "\n";
+                foreach ( $attachments as $att_id => $attachment )
+                        $output .= wp_get_attachment_link($att_id, $size, true) . "\n";
                 return $output;
         }
@@ -652 +655 @@
         $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;