Changeset 50662

Timestamp:

04/06/2021 03:42:02 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.
Merges [50586] to the 5.7 branch.
Fixes #52826.

Location:

branches/5.7

Files:

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

branches/5.7/src/wp-includes/media.php

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