Changeset 46217

Timestamp:

09/20/2019 10:17:48 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Remove a workaround for IMAGETYPE_ICO in file_is_displayable_image().

The IMAGETYPE_ICO constant was introduced in PHP 5.3, so no longer needs a workaround.

Props jrf.
See #48074.

File:

• trunk/src/wp-admin/includes/image.php (modified) (1 diff)

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

@@ -864 +864 @@
  */
 function file_is_displayable_image( $path ) {
-    $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;
-    }
+    $displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_ICO );
 
     $info = @getimagesize( $path );