sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Props SergeyBiryukov
fixes #22532


git-svn-id: https://develop.svn.wordpress.org/trunk@22830 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2012-11-23 16:32:21 +00:00
parent 080b51bfe6
commit 7fbcbebc3d
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 );