Changeset 4552

Timestamp:

11/30/2006 01:56:06 AM (18 years ago)

Author:

ryan

Message:

Don't use 'import' as a mime type. Props mdawaffe and westi. fixes #3219

Location:

trunk

Files:

• wp-admin/admin-functions.php (modified) (2 diffs)
• wp-includes/post-template.php (modified) (3 diffs)

trunk/wp-admin/admin-functions.php

@@ -1983 +1983 @@
 
     $url = $file['url'];
+    $type = $file['type'];
     $file = addslashes( $file['file'] );
     $filename = basename( $file );
@@ -1989 +1990 @@
     $object = array( 'post_title' => $filename,
         'post_content' => $url,
-        'post_mime_type' => 'import',
+        'post_mime_type' => $type,
         'guid' => $url
     );

trunk/wp-includes/post-template.php

@@ -352 +352 @@
     $file = get_post_meta($post->ID, '_wp_attached_file', true);
 
+    $exts = array('jpg', 'gif', 'png');
+
     if ( !$fullsize && !empty($imagedata['thumb'])
             && ($thumbfile = str_replace(basename($file), $imagedata['thumb'], $file))
@@ -362 +364 @@
         $class = 'attachmentthumb';
 
-    } elseif ( substr($mime, 0, 6) == 'image/'
+    } elseif ( ( substr($mime, 0, 6) == 'image/' || 'import' == $mime && in_array(substr($file, -3), $exts) )
             && file_exists($file) ) {
 
@@ -377 +379 @@
 
         $types = array(substr($mime, 0, strpos($mime, '/')), substr($mime, strpos($mime, '/') + 1), str_replace('/', '_', $mime));
-        $exts = array('jpg', 'gif', 'png');
         foreach ($types as $type) {
             foreach ($exts as $ext) {