Changeset 50586 for trunk

Timestamp:

03/26/2021 12:07:26 AM (5 years ago)

Author:

peterwilsoncc

Message:

Media: Conditionally pass 2nd parameter to getimagesize().

In the wrapper function wp_getimagesize() check if the second parameter was passed before sending it to the PHP function getimagesize().

The PHP function has a different execution path depending on the number of parameters passed, this ensures the wrapper function follows the appropriate path.

Follow up to [50552].
Props azaozz, hellofromtonya, Mista-Flo, peterwilsoncc, rinatkhaziev, RogerTheriault, SergeyBiryukov, terriann, whyisjake.
Fixes #52826.

File:

• trunk/src/wp-includes/media.php (modified) (2 diffs)

trunk/src/wp-includes/media.php

@@ -4988 +4988 @@
                 defined( 'WP_DEBUG' ) && WP_DEBUG
         ) {
-                return getimagesize( $filename, $image_info );
+                if ( 2 === func_num_args() ) {
+                        return getimagesize( $filename, $image_info );
+                } else {
+                        return getimagesize( $filename );
+                }
         }
 
@@ -4999 +5003 @@
          *
          * 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 );
+        }
+}