Ticket #24430: 24430.diff

media.php

@@ -690 +690 @@
 function wp_get_attachment_image_src( $attachment_id, $size = 'thumbnail', $icon = false ) {
 
         // get a thumbnail or intermediate image if there is one
-        if ( $image = image_downsize($attachment_id, $size) )
+        if ( $image = image_downsize($attachment_id, $size) ) {
                 return $image;
+        }
 
         $src = false;
 
         if ( $icon && $src = wp_mime_type_icon($attachment_id) ) {
-                /** This filter is documented in wp-includes/post.php */
-                $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
+                // wp_mime_type_icon sets 'icon_files' cache
+                @list($width, $height) = getimagesize(array_search($src, wp_cache_get('icon_files')));
+        }
 
-                $src_file = $icon_dir . '/' . wp_basename($src);
-                @list($width, $height) = getimagesize($src_file);
+        if ( $src && $width && $height ) {
+                return array( $src, $width, $height );
         }
-        if ( $src && $width && $height )
-                return array( $src, $width, $height );
+
         return false;
 }