From 5e2672838780035b7cdb7ed451d3d915d6661f61 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Sun, 16 Jun 2019 01:32:16 +0000 Subject: [PATCH] Media: Ignore errors coming from `image_resize_dimensions()` when creating sub-sizes (for now). It returns `false` when the requested size is larger than the original image and should be skipped. This triggers new `WP_Error` in `WP_Image_Editor::resize()`. See #40439. git-svn-id: https://develop.svn.wordpress.org/trunk@45543 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/image.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/wp-admin/includes/image.php b/src/wp-admin/includes/image.php index 03fecac871..951f51fc60 100644 --- a/src/wp-admin/includes/image.php +++ b/src/wp-admin/includes/image.php @@ -235,12 +235,20 @@ function _wp_make_subsizes( $new_sizes, $file, $image_meta, $attachment_id ) { $new_size_meta = $editor->make_subsize( $new_size_data ); if ( is_wp_error( $new_size_meta ) ) { + $error_code = $new_size_meta->get_error_code(); + + if ( $error_code === 'error_getting_dimensions' ) { + // Ignore errors when `image_resize_dimensions()` returns false. + // They mean that the requested size is larger than the original image and should be skipped. + continue; + } + if ( empty( $image_meta['subsize_errors'] ) ) { $image_meta['subsize_errors'] = array(); } $error = array( - 'error_code' => $new_size_meta->get_error_code(), + 'error_code' => $error_code, 'error_message' => $new_size_meta->get_error_message(), );