From cd86b071080a985d7e1ef4856693aea741484082 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Sat, 15 Jun 2019 01:31:07 +0000 Subject: [PATCH] After [45538]: fix a WPCS fix and make couple of var names consistent. See #40439. git-svn-id: https://develop.svn.wordpress.org/trunk@45539 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/image.php | 6 +++--- src/wp-includes/media.php | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/wp-admin/includes/image.php b/src/wp-admin/includes/image.php index 0ce97b5f76..5b667f4ab5 100644 --- a/src/wp-admin/includes/image.php +++ b/src/wp-admin/includes/image.php @@ -87,7 +87,7 @@ function wp_get_missing_image_subsizes( $attachment_id ) { // Meta error? if ( empty( $image_meta ) ) { - return $defined_sizes; + return $registered_sizes; } $full_width = (int) $image_meta['width']; @@ -379,8 +379,8 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) { */ $fallback_sizes = apply_filters( 'fallback_intermediate_image_sizes', $fallback_sizes, $metadata ); - $defined_sizes = wp_get_registered_image_subsizes(); - $merged_sizes = array_intersect_key( $defined_sizes, array_flip( $fallback_sizes ) ); + $registered_sizes = wp_get_registered_image_subsizes(); + $merged_sizes = array_intersect_key( $registered_sizes, array_flip( $fallback_sizes ) ); // Force thumbnails to be soft crops. if ( isset( $merged_sizes['thumbnail'] ) && is_array( $merged_sizes['thumbnail'] ) ) { diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php index 20cc1b4261..e1180c28f0 100644 --- a/src/wp-includes/media.php +++ b/src/wp-includes/media.php @@ -235,7 +235,11 @@ function image_downsize( $id, $size = 'medium' ) { } elseif ( $size === 'thumbnail' ) { // fall back to the old thumbnail $thumb_file = wp_get_attachment_thumb_file( $id ); - $info = getimagesize( $thumb_file ); + $info = null; + + if ( $thumb_file ) { + $info = getimagesize( $thumb_file ); + } if ( $thumb_file && $info ) { $img_url = str_replace( $img_url_basename, wp_basename( $thumb_file ), $img_url );