Changeset 59315 for trunk/src/wp-includes/media.php

Timestamp:

10/29/2024 01:11:00 AM (2 years ago)

Author:

azaozz

Message:

Media: Fix uploading of .heic images.

• Adds support for all HEIC/HEIF mime types: image/heic, image/heif, image/heic-sequence, and image/heif-sequence.
• Introduces wp_is_heic_image_mime_type().

Props swissspidy, adamsilverstein, debarghyabanerjee, ironprogrammer, peterwilsoncc, apermo, azaozz.
Fixes #62272.

File:

• trunk/src/wp-includes/media.php (modified) (4 diffs)

trunk/src/wp-includes/media.php

@@ -5628 +5628 @@
 function wp_getimagesize( $filename, ?array &$image_info = null ) {
         // Don't silence errors when in debug mode, unless running unit tests.
-        if ( defined( 'WP_DEBUG' ) && WP_DEBUG
-                && ! defined( 'WP_RUN_CORE_TESTS' )
-        ) {
+        if ( defined( 'WP_DEBUG' ) && WP_DEBUG && ! defined( 'WP_RUN_CORE_TESTS' ) ) {
                 if ( 2 === func_num_args() ) {
                         $info = getimagesize( $filename, $image_info );
@@ -5661 +5659 @@
         }
 
+        $image_mime_type = wp_get_image_mime( $filename );
+
+        // Not an image?
+        if ( false === $image_mime_type ) {
+                return false;
+        }
+
         /*
          * For PHP versions that don't support WebP images,
          * extract the image size info from the file headers.
          */
-        if ( 'image/webp' === wp_get_image_mime( $filename ) ) {
+        if ( 'image/webp' === $image_mime_type ) {
                 $webp_info = wp_get_webp_info( $filename );
                 $width     = $webp_info['width'];
@@ -5687 +5692 @@
 
         // For PHP versions that don't support AVIF images, extract the image size info from the file headers.
-        if ( 'image/avif' === wp_get_image_mime( $filename ) ) {
+        if ( 'image/avif' === $image_mime_type ) {
                 $avif_info = wp_get_avif_info( $filename );
 
@@ -5710 +5715 @@
 
         // For PHP versions that don't support HEIC images, extract the size info using Imagick when available.
-        if ( 'image/heic' === wp_get_image_mime( $filename ) ) {
+        if ( wp_is_heic_image_mime_type( $image_mime_type ) ) {
                 $editor = wp_get_image_editor( $filename );
+
                 if ( is_wp_error( $editor ) ) {
                         return false;
                 }
+
                 // If the editor for HEICs is Imagick, use it to get the image size.
                 if ( $editor instanceof WP_Image_Editor_Imagick ) {