Ticket #49889: 49889.diff

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 );
+                
+                if( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+                        $imagesize = getimagesize( $image_file );
+                } else {
+                        $imagesize = @getimagesize( $image_file );
+                }
+                
         }
 
         if ( ! empty( $imagesize ) ) {
@@ -224 +230 @@
  * @return array The image attachment meta data.
  */
 function wp_create_image_subsizes( $file, $attachment_id ) {
-        $imagesize = @getimagesize( $file );
+        
+        if( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+                $imagesize = getimagesize( $file );
+        } else {
+                $imagesize = @getimagesize( $file );
+        }
 
         if ( empty( $imagesize ) ) {
                 // File is not an image.
@@ -687 +698 @@
                 return false;
         }
 
-        list( , , $image_type ) = @getimagesize( $file );
+        if( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+                list( , , $image_type ) = getimagesize( $file );
+        } else {
+                list( , , $image_type ) = @getimagesize( $file );
+        }
 
         /*
          * EXIF contains a bunch of data we'll probably never need formatted in ways
@@ -716 +731 @@
          * as caption, description etc.
          */
         if ( is_callable( 'iptcparse' ) ) {
-                @getimagesize( $file, $info );
+                
+                if( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+                        getimagesize( $file, $info );
+                } else {
+                        @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 +804 @@
         $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 +907 @@
  * @return bool True if valid image, false if not valid image.
  */
 function file_is_valid_image( $path ) {
-        $size = @getimagesize( $path );
+        
+        if( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+                $size = getimagesize( $path );
+        } else {
+                $size = @getimagesize( $path );
+        }
+        
         return ! empty( $size );
 }
 
@@ -892 +928 @@
 function file_is_displayable_image( $path ) {
         $displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_ICO );
 
-        $info = @getimagesize( $path );
+        if( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+                $info = getimagesize( $path );
+        } else {
+                $info = @getimagesize( $path );
+        }
+        
         if ( empty( $info ) ) {
                 $result = false;
         } elseif ( ! in_array( $info[2], $displayable_image_types, true ) ) {