Changeset 40403

Timestamp:

04/10/2017 02:27:23 PM (8 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)
• tests/phpunit/tests/functions.php (modified) (2 diffs)

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 );

branches/4.7/tests/phpunit/tests/functions.php

@@ -901 +901 @@
 
     /**
+     * @ticket 40017
+     * @dataProvider _wp_get_image_mime
+     */
+    public function test_wp_get_image_mime( $file, $expected ) {
+        if ( ! is_callable( 'exif_imagetype' ) && ! function_exists( 'getimagesize' ) ) {
+            $this->markTestSkipped( 'The exif PHP extension is not loaded.' );
+        }
+
+        $this->assertEquals( $expected, wp_get_image_mime( $file ) );
+    }
+
+    /**
      * @ticket 39550
      * @dataProvider _wp_check_filetype_and_ext_data
@@ -976 +988 @@
         $mimes['woff'] = 'application/font-woff';
         return $mimes;
+    }
+
+    /**
+     * Data profider for test_wp_get_image_mime();
+     */
+    public function _wp_get_image_mime() {
+        $data = array(
+            // Standard JPEG.
+            array(
+                DIR_TESTDATA . '/images/test-image.jpg',
+                'image/jpeg',
+            ),
+            // Standard GIF.
+            array(
+                DIR_TESTDATA . '/images/test-image.gif',
+                'image/gif',
+            ),
+            // Standard PNG.
+            array(
+                DIR_TESTDATA . '/images/test-image.png',
+                'image/png',
+            ),
+            // Image with wrong extension.
+            array(
+                DIR_TESTDATA . '/images/test-image-mime-jpg.png',
+                'image/jpeg',
+            ),
+            // Not an image.
+            array(
+                DIR_TESTDATA . '/uploads/dashicons.woff',
+                false,
+            ),
+        );
+
+        return $data;
     }