WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Props SergeyBiryukov
fixes #22532


git-svn-id: http://core.svn.wordpress.org/trunk@22830 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2012-11-23 16:32:21 +00:00
parent cc58c611ec
commit 7a0852c31c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/media.php
View File

@ -1294,13 +1294,16 @@ add_action( 'customize_controls_enqueue_scripts', 'wp_plupload_default_settings'
*/
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 );