Changeset 58248

Timestamp:

05/30/2024 01:01:44 PM (12 months ago)

Author:

joedolson

Message:

Media: Protect mime type icon function from simple errors.

Handle $preferred_ext arguments that are passed with minor errors in formatting, such as incorrect casing or missing .. Add unit tests to verify that an omitted period on an otherwise correct extension is accepted. Follow up to [57687].

Props sabernhardt, joedolson, khokansardar.
Fixes #60610.

Location:

trunk

Files:

• src/wp-includes/post.php (modified) (1 diff)
• tests/phpunit/tests/post/attachments.php (modified) (1 diff)

trunk/src/wp-includes/post.php

@@ -6871 +6871 @@
     }
 
+    // Check if preferred file format variable is present and is a validly formatted file extension.
+    if ( ! empty( $preferred_ext ) && is_string( $preferred_ext ) && ! str_starts_with( $preferred_ext, '.' ) ) {
+        $preferred_ext = '.' . strtolower( $preferred_ext );
+    }
+
     $post_id = 0;
     if ( empty( $icon ) ) {

trunk/tests/phpunit/tests/post/attachments.php

@@ -520 +520 @@
         $this->assertStringContainsString( 'images/media/video.png', $icon );
     }
+
+    /**
+     * @ticket 60610
+     */
+    public function test_wp_mime_type_icon_video_with_preferred_ext() {
+        $icon1 = wp_mime_type_icon( 'video/mp4', '.png' ); // Added `$preferred_ext` parameter.
+        $icon2 = wp_mime_type_icon( 'video/mp4', 'png' ); // Added `$preferred_ext` parameter without period.
+
+        $this->assertStringContainsString( 'images/media/video.png', $icon1, 'Mime type icon should be correctly returned with ".png" argument.' );
+        $this->assertStringContainsString( 'images/media/video.png', $icon2, 'Mime type icon should be correctly returned with "png" argument.' );
+    }
 }