mirror of
https://github.com/WordPress/WordPress.git
synced 2024-12-23 01:27:36 +01:00
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. Built from https://develop.svn.wordpress.org/trunk@50586 git-svn-id: http://core.svn.wordpress.org/trunk@50199 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
9b8c498eea
commit
cc7bdc71e8
@ -4987,7 +4987,11 @@ function wp_getimagesize( $filename, array &$image_info = null ) {
|
||||
// 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,8 +5002,12 @@ function wp_getimagesize( $filename, array &$image_info = null ) {
|
||||
* 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 );
|
||||
}
|
||||
}
|
||||
|
@ -13,7 +13,7 @@
|
||||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '5.8-alpha-50585';
|
||||
$wp_version = '5.8-alpha-50586';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
Loading…
Reference in New Issue
Block a user