Ticket #52826: trac-52826.diff

wp-includes/media.php

@@ -4979 +4979 @@
  * @param array  $imageinfo Extended image information, passed by reference.
  * @return array|false Array of image information or false on failure.
  */
-function wp_getimagesize( $filename, &$imageinfo = array() ) {
+function wp_getimagesize( $filename, &$imageinfo = null ) {
         if (
                 // Skip when running unit tests.
                 ! defined( 'WP_RUN_CORE_TESTS' )
@@ -4987 +4987 @@
                 // Return without silencing errors when in debug mode.
                 defined( 'WP_DEBUG' ) && WP_DEBUG
         ) {
-                return getimagesize( $filename, $imageinfo );
+                if ( ! is_null( $imageinfo ) ) {
+                        return getimagesize( $filename, $imageinfo );
+                } 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, $imageinfo );
+        if ( ! is_null( $imageinfo ) ) {
+                // phpcs:ignore WordPress.PHP.NoSilencedErrors
+                return @getimagesize( $filename, $imageinfo );
+        } else {
+                // phpcs:ignore WordPress.PHP.NoSilencedErrors
+                return @getimagesize( $filename );
+        }
 }