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

Media: Avoid a PHP notice in `image_downsize()` when trying to replace a non-image URL with a rendered image from its meta. 

Props Mte90, jrf, hareesh-pillai.
Merges [46772] to the 5.3 branch.
Fixes #48324.
Built from https://develop.svn.wordpress.org/branches/5.3@46773


git-svn-id: http://core.svn.wordpress.org/branches/5.3@46573 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-11-25 10:09:01 +00:00
parent 0a417c0dc9
commit 35e045286d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/media.php
View File

@ -214,7 +214,7 @@ function image_downsize( $id, $size = 'medium' ) {
// If the file isn't an image, attempt to replace its URL with a rendered image from its meta. // If the file isn't an image, attempt to replace its URL with a rendered image from its meta.
// Otherwise, a non-image type could be returned. // Otherwise, a non-image type could be returned.
if ( ! $is_image ) { if ( ! $is_image ) {
if ( ! empty( $meta['sizes'] ) ) { if ( ! empty( $meta['sizes']['full'] ) ) {
$img_url = str_replace( $img_url_basename, $meta['sizes']['full']['file'], $img_url ); $img_url = str_replace( $img_url_basename, $meta['sizes']['full']['file'], $img_url );
$img_url_basename = $meta['sizes']['full']['file']; $img_url_basename = $meta['sizes']['full']['file'];
$width = $meta['sizes']['full']['width']; $width = $meta['sizes']['full']['width'];

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.3.1-alpha-46771'; $wp_version = '5.3.1-alpha-46773';
/** /**
* 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.