Changeset 40403 for branches/4.7/src/wp-includes/functions.php

Timestamp:

04/10/2017 02:27:23 PM (7 years ago)

Author:

swissspidy

Message:

Media: Improve handling of non-image files in wp_get_image_mime.

This prevents non-image fileypes from returning a mime type of "application/octet-stream" when exif_imagetype() returns false.

Props blobfolio.
Fixes #40017.

Merges [40397] to the 4.7 branch.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-includes/functions.php (modified) (1 diff)

branches/4.7/src/wp-includes/functions.php

@@ -2367 +2367 @@
     try {
         if ( is_callable( 'exif_imagetype' ) ) {
-            $mime = image_type_to_mime_type( exif_imagetype( $file ) );
+            $imagetype = exif_imagetype( $file );
+            $mime = ( $imagetype ) ? image_type_to_mime_type( $imagetype ) : false;
         } elseif ( function_exists( 'getimagesize' ) ) {
             $imagesize = getimagesize( $file );