Ticket #18178: gallery-no-link.18178a.diff

wp-admin/includes/media.php

@@ -445 +445 @@
 
         if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
                 $attachment = wp_unslash( $attachment );
-        
+
                 $post = $_post = get_post($attachment_id, ARRAY_A);
                 $post_type_object = get_post_type_object( $post[ 'post_type' ] );
 

wp-includes/media-template.php

@@ -353 +353 @@
                                 <option value="post">
                                         <?php esc_attr_e('Attachment Page'); ?>
                                 </option>
+                                <option value="none">
+                                        <?php esc_attr_e('None'); ?>
+                                </option>
                         </select>
                 </label>
 

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);
+                /*
+                * Output image link. By default, image links to
+                * attachment page. If link="file" is passed to
+                * the shortcode, the image links directly to
+                * the file.
+                */
+                $image_link = isset( $attr['link'] ) && 'file' == $attr['link'] ? wp_get_attachment_link( $id, $size, false, false ) : wp_get_attachment_link( $id, $size, true, false );
+                /*
+                * Output flat image. By default, image links to
+                * attachment page. If link="none" is passed to
+                * the shortcode, a flat (unlinked) image is
+                * output.
+                 */
+                $flat_image = ( isset( $attr['link'] ) && 'none' == $attr['link'] ? wp_get_attachment_image( $id, $size, false ) : false );
+                // Determine whether to output a linked or flat image
+                $image_output = ( $flat_image ? $flat_image : $image_link );
 
                 $output .= "<{$itemtag} class='gallery-item'>";
                 $output .= "
                         <{$icontag} class='gallery-icon'>
-                                $link
+                                $image_output
                         </{$icontag}>";
                 if ( $captiontag && trim($attachment->post_excerpt) ) {
                         $output .= "