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

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.
Built from https://develop.svn.wordpress.org/trunk@45543


git-svn-id: http://core.svn.wordpress.org/trunk@45354 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2019-06-16 01:33:51 +00:00
parent 4e4ef1170b
commit 88ffa41ee3
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/includes/image.php
View File

@ -235,12 +235,20 @@ function _wp_make_subsizes( $new_sizes, $file, $image_meta, $attachment_id ) {
$new_size_meta = $editor->make_subsize( $new_size_data ); $new_size_meta = $editor->make_subsize( $new_size_data );
if ( is_wp_error( $new_size_meta ) ) { 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'] ) ) { if ( empty( $image_meta['subsize_errors'] ) ) {
$image_meta['subsize_errors'] = array(); $image_meta['subsize_errors'] = array();
} }
$error = array( $error = array(
'error_code' => $new_size_meta->get_error_code(), 'error_code' => $error_code,
'error_message' => $new_size_meta->get_error_message(), 'error_message' => $new_size_meta->get_error_message(),
); );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.3-alpha-45542'; $wp_version = '5.3-alpha-45543';
/** /**
* 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.