Ticket #49889: 49889-3.diff

wp-admin/includes/ajax-actions.php

@@ -3900 +3900 @@
                         $parent_url = wp_get_attachment_url( $attachment_id );
                         $url        = str_replace( wp_basename( $parent_url ), wp_basename( $cropped ), $parent_url );
 
-                        $size       = @getimagesize( $cropped );
+                        $size       = wp_getimagesize( $cropped );
                         $image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
 
                         $object = array(

wp-admin/includes/class-custom-image-header.php

@@ -791 +791 @@
                 }
 
                 if ( file_exists( $file ) ) {
-                        list( $width, $height, $type, $attr ) = @getimagesize( $file );
+                        list( $width, $height, $type, $attr ) = wp_getimagesize( $file );
                 } else {
                         $data   = wp_get_attachment_metadata( $attachment_id );
                         $height = isset( $data['height'] ) ? $data['height'] : 0;
@@ -1223 +1223 @@
                 $parent_url = wp_get_attachment_url( $parent->ID );
                 $url        = str_replace( wp_basename( $parent_url ), wp_basename( $cropped ), $parent_url );
 
-                $size       = @getimagesize( $cropped );
+                $size       = wp_getimagesize( $cropped );
                 $image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
 
                 $object = array(

wp-admin/includes/class-wp-site-icon.php

@@ -87 +87 @@
                 $parent_url = wp_get_attachment_url( $parent->ID );
                 $url        = str_replace( wp_basename( $parent_url ), wp_basename( $cropped ), $parent_url );
 
-                $size       = @getimagesize( $cropped );
+                $size       = wp_getimagesize( $cropped );
                 $image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
 
                 $object = array(

wp-admin/includes/image.php

@@ -93 +93 @@
         // Use the originally uploaded image dimensions as full_width and full_height.
         if ( ! empty( $image_meta['original_image'] ) ) {
                 $image_file = wp_get_original_image_path( $attachment_id );
-                $imagesize  = @getimagesize( $image_file );
+                $imagesize  = wp_getimagesize( $image_file );
         }
 
         if ( ! empty( $imagesize ) ) {
@@ -224 +224 @@
  * @return array The image attachment meta data.
  */
 function wp_create_image_subsizes( $file, $attachment_id ) {
-        $imagesize = @getimagesize( $file );
+        $imagesize = wp_getimagesize( $file );
 
         if ( empty( $imagesize ) ) {
                 // File is not an image.
@@ -687 +687 @@
                 return false;
         }
 
-        list( , , $image_type ) = @getimagesize( $file );
+        list( , , $image_type ) = wp_getimagesize( $file );
 
         /*
          * EXIF contains a bunch of data we'll probably never need formatted in ways
@@ -716 +716 @@
          * as caption, description etc.
          */
         if ( is_callable( 'iptcparse' ) ) {
-                @getimagesize( $file, $info );
+                wp_getimagesize( $file, $info );
 
                 if ( ! empty( $info['APP13'] ) ) {
-                        $iptc = @iptcparse( $info['APP13'] );
+                        
+                        if( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+                                $iptc = iptcparse( $info['APP13'] );
+                        } else {
+                                $iptc = @iptcparse( $info['APP13'] );
+                        }
 
                         // Headline, "A brief synopsis of the caption".
                         if ( ! empty( $iptc['2#105'][0] ) ) {
@@ -779 +784 @@
         $exif_image_types = apply_filters( 'wp_read_image_metadata_types', array( IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM ) );
 
         if ( is_callable( 'exif_read_data' ) && in_array( $image_type, $exif_image_types, true ) ) {
-                $exif = @exif_read_data( $file );
+                
+                if( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+                        $exif = exif_read_data( $file );
+                } else {
+                        $exif = @exif_read_data( $file );
+                }
 
                 if ( ! empty( $exif['ImageDescription'] ) ) {
                         mbstring_binary_safe_encoding();
@@ -877 +887 @@
  * @return bool True if valid image, false if not valid image.
  */
 function file_is_valid_image( $path ) {
-        $size = @getimagesize( $path );
+        $size = wp_getimagesize( $path );
         return ! empty( $size );
 }
 
@@ -892 +902 @@
 function file_is_displayable_image( $path ) {
         $displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_ICO );
 
-        $info = @getimagesize( $path );
+        $info = wp_getimagesize( $path );
         if ( empty( $info ) ) {
                 $result = false;
         } elseif ( ! in_array( $info[2], $displayable_image_types, true ) ) {

wp-includes/class-wp-image-editor-gd.php

@@ -99 +99 @@
                         return new WP_Error( 'invalid_image', __( 'File is not an image.' ), $this->file );
                 }
 
-                $size = @getimagesize( $this->file );
+                $size = wp_getimagesize( $this->file );
                 if ( ! $size ) {
                         return new WP_Error( 'invalid_image', __( 'Could not read image size.' ), $this->file );
                 }

wp-includes/deprecated.php

@@ -1924 +1924 @@
         // Do we need to constrain the image?
         if ( ($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file) ) {
 
-                $imagesize = @getimagesize($src_file);
+                $imagesize = wp_getimagesize($src_file);
 
                 if (($imagesize[0] > $max_dims[0]) || $imagesize[1] > $max_dims[1] ) {
                         $actual_aspect = $imagesize[0] / $imagesize[1];

wp-includes/functions.php

@@ -2992 +2992 @@
                         $imagetype = exif_imagetype( $file );
                         $mime      = ( $imagetype ) ? image_type_to_mime_type( $imagetype ) : false;
                 } elseif ( function_exists( 'getimagesize' ) ) {
-                        $imagesize = @getimagesize( $file );
+                        $imagesize = wp_getimagesize( $file );
                         $mime      = ( isset( $imagesize['mime'] ) ) ? $imagesize['mime'] : false;
                 } else {
                         $mime = false;
@@ -7606 +7606 @@
 function wp_fuzzy_number_match( $expected, $actual, $precision = 1 ) {
         return abs( (float) $expected - (float) $actual ) <= $precision;
 }
+
+/**
+ * Allow PHPs getimagesize() to be debuggable when necessary.
+ *
+ * @since 5.5.0 
+ *
+ * @param string $filename      The file path.
+ * @param array $imageinfo      Extended image information.
+ * @return array|false Array of image information or false on failure. 
+ */
+function wp_getimagesize( $filename, &$imageinfo = array() ) {
+        
+        if( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+                return getimagesize( $filename, $imageinfo );
+        }
+        
+        return @getimagesize( $filename, $imageinfo );
+        
+}

wp-includes/media.php

@@ -245 +245 @@
                 $info       = null;
 
                 if ( $thumb_file ) {
-                        $info = @getimagesize( $thumb_file );
+                        $info = wp_getimagesize( $thumb_file );
                 }
 
                 if ( $thumb_file && $info ) {
@@ -963 +963 @@
                                 $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
 
                                 $src_file               = $icon_dir . '/' . wp_basename( $src );
-                                list( $width, $height ) = @getimagesize( $src_file );
+                                list( $width, $height ) = wp_getimagesize( $src_file );
                         }
                 }