Changeset 42780

Timestamp:

03/05/2018 01:02:20 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Media: Recognize .ico files as displayable images on PHP 5.3+ and allow attachment meta data to be generated for them.

Props remyvv, Guido07111975.
Fixes #43458.

Location:

trunk

Files:

• src/wp-admin/includes/image.php (modified) (1 diff)
• tests/phpunit/data/images/test-image.ico (added)
• tests/phpunit/tests/image/functions.php (modified) (2 diffs)

trunk/src/wp-admin/includes/image.php

@@ -557 +557 @@
     $displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP );
 
+    // IMAGETYPE_ICO is only defined in PHP 5.3+.
+    if ( defined( 'IMAGETYPE_ICO' ) ) {
+        $displayable_image_types[] = IMAGETYPE_ICO;
+    }
+
     $info = @getimagesize( $path );
     if ( empty( $info ) ) {

trunk/tests/phpunit/tests/image/functions.php

@@ -62 +62 @@
         );
 
+        // IMAGETYPE_ICO is only defined in PHP 5.3+.
+        if ( defined( 'IMAGETYPE_ICO' ) ) {
+            $files[] = 'test-image.ico';
+        }
+
         foreach ( $files as $file ) {
             $this->assertTrue( file_is_valid_image( DIR_TESTDATA . '/images/' . $file ), "file_is_valid_image($file) should return true" );
@@ -87 +92 @@
             'test-image.jpg',
         );
+
+        // IMAGETYPE_ICO is only defined in PHP 5.3+.
+        if ( defined( 'IMAGETYPE_ICO' ) ) {
+            $files[] = 'test-image.ico';
+        }
 
         foreach ( $files as $file ) {