Changeset 22830

Timestamp:

11/23/2012 04:32:21 PM (12 years ago)

Author:

ryan

Message:

Handle attachments that have an empty mime type or a mime type without a subtype.

Props SergeyBiryukov
fixes #22532

File:

• trunk/wp-includes/media.php (modified) (1 diff)

trunk/wp-includes/media.php

@@ -1295 +1295 @@
 function wp_prepare_attachment_for_js( $attachment ) {
     if ( ! $attachment = get_post( $attachment ) )
-       return;
+        return;
 
     if ( 'attachment' != $attachment->post_type )
-       return;
+        return;
 
     $meta = wp_get_attachment_metadata( $attachment->ID );
-    list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
+    if ( false !== strpos( $attachment->post_mime_type, '/' ) )
+        list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
+    else
+        list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
 
     $attachment_url = wp_get_attachment_url( $attachment->ID );