Changeset 59360 for branches/6.7/src/wp-includes/media.php

Timestamp:

11/06/2024 12:45:48 AM (5 months ago)

Author:

peterwilsoncc

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().

This backport includes a subsequent fix of a typo.

Reviewed by peterwilsoncc.
Merges [59315,59358] to the 6.7 branch.

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

Location:

branches/6.7

Files:

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

branches/6.7/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 ) {