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

Timestamp:

02/21/2024 07:25:18 PM (7 months ago)

Author:

joedolson

Message:

Media: Ensure wp_mine_type_icon() returns expected file type.

Add an argument to wp_mime_type_icon() to control the file type returned. Following [57638], there are two file formats in the media icons directory. Different systems would pull up different files by default dependent on the order loaded into the cached array, causing intermittent test failures and unpredictable behavior.

Function update allows core usages to always return the .svg while maintaining backwards compatibility for any extended usage that expects a .png. Follow up to [57638].

Also handles a missed case in media list view.

Props SergeyBiryukov, sabernhardt, joedolson, antpb.
Fixes #31352.

File:

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

trunk/src/wp-includes/media.php

@@ -973 +973 @@
 
         if ( $icon ) {
-            $src = wp_mime_type_icon( $attachment_id );
+            $src = wp_mime_type_icon( $attachment_id, '.svg' );
 
             if ( $src ) {
@@ -979 +979 @@
                 $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
 
-                $src_file               = $icon_dir . '/' . wp_basename( $src );
+                $src_file = $icon_dir . '/' . wp_basename( $src );
                 list( $width, $height ) = wp_getimagesize( $src_file );
+                $ext      = strtolower( substr( $src_file, -4 ) );
+                if ( '.svg' === $ext ) {
+                    // SVG does not have true dimensions, so this assigns width and height directly.
+                    $width  = 48;
+                    $height = 64;
+                } else {
+                    list( $width, $height ) = wp_getimagesize( $src_file );
+                }
             }
         }
@@ -3068 +3076 @@
                 $track['thumb']               = compact( 'src', 'width', 'height' );
             } else {
-                $src            = wp_mime_type_icon( $attachment->ID );
+                $src            = wp_mime_type_icon( $attachment->ID, '.svg' );
                 $width          = 48;
                 $height         = 64;
@@ -4340 +4348 @@
         'type'          => $type,
         'subtype'       => $subtype,
-        'icon'          => wp_mime_type_icon( $attachment->ID ),
+        'icon'          => wp_mime_type_icon( $attachment->ID, '.svg' ),
         'dateFormatted' => mysql2date( __( 'F j, Y' ), $attachment->post_date ),
         'nonces'        => array(
@@ -4511 +4519 @@
             $response['thumb']            = compact( 'src', 'width', 'height' );
         } else {
-            $src               = wp_mime_type_icon( $attachment->ID );
+            $src               = wp_mime_type_icon( $attachment->ID, '.svg' );
             $width             = 48;
             $height            = 64;