WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Media: Ensure a consistent structure for the array returned by `wp_get_attachment_image_src()`. 

The array returned by this function previously included a fourth element only when an intermediate image size was used. This change ensures a consistent structure in the returned array regardless of the function's internal behaviour.

Props wido, joemcgill, johnbillion

Fixes #46113
Built from https://develop.svn.wordpress.org/trunk@47748


git-svn-id: http://core.svn.wordpress.org/trunk@47524 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2020-05-02 22:57:06 +00:00
parent 1a27d51b48
commit f89f744fb2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/media.php
View File

@ -947,6 +947,7 @@ function wp_get_registered_image_subsizes() {
* @type string $0 Image source URL. * @type string $0 Image source URL.
* @type int $1 Image width in pixels. * @type int $1 Image width in pixels.
* @type int $2 Image height in pixels. * @type int $2 Image height in pixels.
* @type bool $3 Whether the image is a resized image.
* } * }
*/ */
function wp_get_attachment_image_src( $attachment_id, $size = 'thumbnail', $icon = false ) { function wp_get_attachment_image_src( $attachment_id, $size = 'thumbnail', $icon = false ) {
@ -968,7 +969,7 @@ function wp_get_attachment_image_src( $attachment_id, $size = 'thumbnail', $icon
} }
if ( $src && $width && $height ) { if ( $src && $width && $height ) {
$image = array( $src, $width, $height ); $image = array( $src, $width, $height, false );
} }
} }
/** /**
@ -982,6 +983,7 @@ function wp_get_attachment_image_src( $attachment_id, $size = 'thumbnail', $icon
* @type string $0 Image source URL. * @type string $0 Image source URL.
* @type int $1 Image width in pixels. * @type int $1 Image width in pixels.
* @type int $2 Image height in pixels. * @type int $2 Image height in pixels.
* @type bool $3 Whether the image is a resized image.
* } * }
* @param int $attachment_id Image attachment ID. * @param int $attachment_id Image attachment ID.
* @param string|int[] $size Requested size of image. Image size name, or array of width * @param string|int[] $size Requested size of image. Image size name, or array of width

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.5-alpha-47747'; $wp_version = '5.5-alpha-47748';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.