Changeset 7212

Timestamp:

03/10/2008 09:31:33 PM (18 years ago)

Author:

matt

Message:

Icon fixes. See #5911; hat tip: andy.

Location:

trunk

Files:

• wp-admin/edit-attachment-rows.php (modified) (2 diffs)
• wp-includes/media.php (modified) (3 diffs)

trunk/wp-admin/edit-attachment-rows.php

@@ -40 +40 @@
     case 'icon':
         ?>
-        <td class="media-icon"><?php echo the_attachment_link($post->ID, false, array(48,48)); ?></td>
+        <td class="media-icon"><?php echo get_the_attachment_link($post->ID, 'thumbnail', array(48,48)); ?></td>
         <?php
         // TODO
@@ -47 +47 @@
     case 'media':
         ?>
-        <td><strong><a href="# TODO: upload.php?action=edit&amp;post=<?php the_ID(); ?>"><?php the_title(); ?></a></strong><br />
+        <td><strong><!-- TODO <a href="upload.php?action=edit&amp;post=<?php the_ID(); ?>"> --><?php the_title(); ?><!-- </a> --></strong><br />
         <?php echo strtoupper(preg_replace('/^.*?\.(\w+)$/', '$1', get_attached_file($post->ID))); ?>
         <?php do_action('manage_media_media_column', $post->ID); ?>

trunk/wp-includes/media.php

@@ -51 +51 @@
 function image_downsize($id, $size = 'medium') {
 
+    if ( !wp_attachment_is_image($id) )
+        return false;
+
     $img_url = wp_get_attachment_url($id);
     $meta = wp_get_attachment_metadata($id);
@@ -72 +75 @@
             $height = $info[1];
         }
-        else
-            return false;
     }
     elseif ( isset($meta['width'], $meta['height']) ) {
@@ -262 +263 @@
     
     // get a thumbnail or intermediate image if there is one
-    $image = image_downsize($attachment_id, $size);
-    if ( $image ) {
-        list ( $src, $width, $height ) = $image;
-    }
-    elseif ( $src = wp_mime_type_icon($attachment_id) ) {
-        $icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' );
+    if ( $image = image_downsize($attachment_id, $size) )
+        return $image;
+
+    if ( $src = wp_mime_type_icon($attachment_id) ) {
+        $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/crystal' );
         $src_file = $icon_dir . '/' . basename($src);
         @list($width, $height) = getimagesize($src_file);
     }
-    
     if ( $src && $width && $height )
         return array( $src, $width, $height );