Ticket #18178: 18178.diff

wp-includes/media.php

@@ -763 +763 @@
                                 text-align: center;
                                 width: {$itemwidth}%;
                         }
-                        #{$selector} img {
-                                border: 2px solid #cfcfcf;
-                        }
                         #{$selector} .gallery-caption {
                                 margin-left: 0;
                         }
@@ -777 +774 @@
 
         $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);
+                $image_output = '';
+                if ( ! empty( $attr['link'] ) && 'file' === $attr['link'] ) {
+                        $image_output = wp_get_attachment_link( $id, $size, false, false );
+                } elseif ( ! empty( $attr['link'] ) && 'none' === $attr['link'] ) {
+                        $image_output = wp_get_attachment_image( $id, $size, false );
+                }
 
+                if ( empty( $image_output ) )
+                        $image_output = wp_get_attachment_link( $id, $size, true, false );
+
                 $output .= "<{$itemtag} class='gallery-item'>";
                 $output .= "
                         <{$icontag} class='gallery-icon'>
-                                $link
+                                $image_output
                         </{$icontag}>";
                 if ( $captiontag && trim($attachment->post_excerpt) ) {
                         $output .= "