Changeset 24550

Timestamp:

07/03/2013 08:43:19 PM (11 years ago)

Author:

nacin

Message:

Allow gallery to be inserted with no links on the images. props chipbennett, helgatheviking, aaroncampbell, wonderboymusic. fixes #18178.

Location:

trunk/wp-includes

Files:

• media-template.php (modified) (1 diff)
• media.php (modified) (2 diffs)

trunk/wp-includes/media-template.php

@@ -354 +354 @@
                     <?php esc_attr_e('Media File'); ?>
                 </option>
+                <option value="none">
+                    <?php esc_attr_e('None'); ?>
+                </option>
             </select>
         </label>

trunk/wp-includes/media.php

@@ -779 +779 @@
     $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);
+        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 );
+        else
+            $image_output = wp_get_attachment_link( $id, $size, true, false );
+
         $image_meta  = wp_get_attachment_metadata( $id );
 
@@ -789 +795 @@
         $output .= "
             <{$icontag} class='gallery-icon {$orientation}'>
-                $link
+                $image_output
             </{$icontag}>";
         if ( $captiontag && trim($attachment->post_excerpt) ) {