Ticket #31352: 31352.follow.diff

src/wp-includes/media.php

@@ -978 +978 @@
                                 /** This filter is documented in wp-includes/post.php */
                                 $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
 
-                                $src_file               = $icon_dir . '/' . wp_basename( $src );
-                                list( $width, $height ) = wp_getimagesize( $src_file );
+                                $src_file = $icon_dir . '/' . wp_basename( $src );
+                                $ext      = strtolower( substr( $src_file, -4 ) );
+                                if ( '.svg' === $ext ) {
+                                        // SVG doesn't have true dimensions, so we assign width and height directly.
+                                        $width  = 48;
+                                        $height = 64;
+                                } else {
+                                        list( $width, $height ) = wp_getimagesize( $src_file );
+                                }
                         }
                 }
 

tests/phpunit/tests/media.php

@@ -399 +399 @@
                 $this->assertSame( '', $prepped['subtype'] );
                 // #21963, there will be a GUID always, so there will be a URL.
                 $this->assertNotEquals( '', $prepped['url'] );
-                $this->assertSame( site_url( 'wp-includes/images/media/default.png' ), $prepped['icon'] );
+                $this->assertSame( site_url( 'wp-includes/images/media/default.svg' ), $prepped['icon'] );
 
                 // Fake a mime.
                 $post->post_mime_type = 'image/jpeg';

tests/phpunit/tests/post/attachments.php

@@ -508 +508 @@
         public function test_wp_mime_type_icon() {
                 $icon = wp_mime_type_icon();
 
-                $this->assertStringContainsString( 'images/media/default.png', $icon );
+                $this->assertStringContainsString( 'images/media/default.svg', $icon );
         }
 
         /**
@@ -517 +517 @@
         public function test_wp_mime_type_icon_video() {
                 $icon = wp_mime_type_icon( 'video/mp4' );
 
-                $this->assertStringContainsString( 'images/media/video.png', $icon );
+                $this->assertStringContainsString( 'images/media/video.svg', $icon );
         }
 }