Ticket #10734: media.diff

wp-includes/media.php

@@ -709 +709 @@
         $itemtag = tag_escape($itemtag);
         $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'>
-                        #{$selector} {
-                                margin: auto;
-                        }
-                        #{$selector} .gallery-item {
-                                float: left;
-                                margin-top: 10px;
-                                text-align: center;
-                                width: {$itemwidth}%;                   }
-                        #{$selector} img {
-                                border: 2px solid #cfcfcf;
-                        }
-                        #{$selector} .gallery-caption {
-                                margin-left: 0;
-                        }
-                </style>
-                <!-- see gallery_shortcode() in wp-includes/media.php -->
                 <div id='$selector' class='gallery galleryid-{$id}'>");
 
         $i = 0;
         foreach ( $attachments as $id => $attachment ) {
                 $link = isset($attr['link']) && 'file' == $attr['link'] ? wp_get_attachment_link($id, $size, false, false) : wp_get_attachment_link($id, $size, true, false);
 
-                $output .= "<{$itemtag} class='gallery-item'>";
+                $output .= "<{$itemtag} class='gallery-item col-{$columns}'>";
                 $output .= "
                         <{$icontag} class='gallery-icon'>
                                 $link
@@ -750 +732 @@
                 }
                 $output .= "</{$itemtag}>";
                 if ( $columns > 0 && ++$i % $columns == 0 )
-                        $output .= '<br style="clear: both" />';
+                        $output .= '<br />';
         }
 
-        $output .= "
-                        <br style='clear: both;' />
-                </div>\n";
+        $output .= "</div>\n";
 
         return $output;
 }