Ticket #39552: 39552.2.diff

wp-includes/functions.php

@@ -2285 +2285 @@
                 // Attempt to figure out what type of image it actually is
                 $real_mime = wp_get_image_mime( $file );
 
+                // Special-case SVG images as they may return a text/ mime-type.
+                if ( 0 === strpos( $type, 'image/svg+xml' ) && 0 === strpos( $real_mime, 'text/' ) ) {
+                    $fhandle = fopen( $file, 'r' );
+                    $first_five_bytes = fread( $fhandle, 5 );
+                    fclose( $fhandle );
+
+                    $xmlpos = strpos( $first_five_bytes, '<?xml' );
+                    $svgpos = strpos( $first_five_bytes, '<svg' );
+                    if ( -1 !== $xmlpos || -1 !== $svgpos ) {
+                                $real_mime = 'image/svg+xml';
+                        }
+                }
+
                 if ( ! $real_mime ) {
                         $type = $ext = false;
                 } elseif ( $real_mime != $type ) {
@@ -2377 +2390 @@
                 $mime = false;
         }
 
+        try {
+                if ( false === $mime && function_exists( 'finfo_file' ) ) {
+                        // Use finfo_file if available to validate non-image files.
+                        $finfo = finfo_open( FILEINFO_MIME_TYPE );
+                        $mime = finfo_file( $finfo, $file );
+                        finfo_close( $finfo );
+                }
+        } catch ( Exception $e ) {
+                $mime = false;
+        }
+
         return $mime;
 }
 
@@ -2408 +2432 @@
         'bmp' => 'image/bmp',
         'tiff|tif' => 'image/tiff',
         'ico' => 'image/x-icon',
+    'svg' => 'image/svg+xml',
         // Video formats.
         'asf|asx' => 'video/x-ms-asf',
         'wmv' => 'video/x-ms-wmv',
@@ -2523 +2548 @@
          *                        of file types.
          */
         return apply_filters( 'ext2type', array(
-                'image'       => array( 'jpg', 'jpeg', 'jpe',  'gif',  'png',  'bmp',   'tif',  'tiff', 'ico' ),
+                'image'       => array( 'jpg', 'jpeg', 'jpe',  'gif',  'png',  'bmp',   'tif',  'tiff', 'ico', 'svg' ),
                 'audio'       => array( 'aac', 'ac3',  'aif',  'aiff', 'm3a',  'm4a',   'm4b',  'mka',  'mp1',  'mp2',  'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma' ),
                 'video'       => array( '3g2',  '3gp', '3gpp', 'asf', 'avi',  'divx', 'dv',   'flv',  'm4v',   'mkv',  'mov',  'mp4',  'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt',  'rm', 'vob', 'wmv' ),
                 'document'    => array( 'doc', 'docx', 'docm', 'dotm', 'odt',  'pages', 'pdf',  'xps',  'oxps', 'rtf',  'wp', 'wpd', 'psd', 'xcf' ),