Ticket #52826: 52826.5.diff

src/wp-admin/includes/image.php

@@ -711 +711 @@
         );
 
         $iptc = array();
-        $info = array();
         /*
          * Read IPTC first, since it might contain data not available in exif such
          * as caption, description etc.

src/wp-includes/media.php

@@ -4987 +4987 @@
                 // Return without silencing errors when in debug mode.
                 defined( 'WP_DEBUG' ) && WP_DEBUG
         ) {
-                return getimagesize( $filename, $image_info );
+                if ( 2 === func_num_args() ) {
+                        return getimagesize( $filename, $image_info );
+                } else {
+                        return getimagesize( $filename );
+                }
         }
 
         /*
@@ -4998 +5002 @@
          * even when it's able to provide image size information.
          *
          * See https://core.trac.wordpress.org/ticket/42480
-         *
-         * phpcs:ignore WordPress.PHP.NoSilencedErrors
          */
-        return @getimagesize( $filename, $image_info );
+        if ( 2 === func_num_args() ) {
+                // phpcs:ignore WordPress.PHP.NoSilencedErrors
+                return @getimagesize( $filename, $image_info );
+        } else {
+                // phpcs:ignore WordPress.PHP.NoSilencedErrors
+                return @getimagesize( $filename );
+        }
 }