Changeset 45543 for trunk/src/wp-admin/includes/image.php

Timestamp:

06/16/2019 01:32:16 AM (6 years ago)

Author:

azaozz

Message:

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.

File:

• trunk/src/wp-admin/includes/image.php (modified) (2 diffs)

trunk/src/wp-admin/includes/image.php

@@ -236 +236 @@
 
                     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();
@@ -241 +249 @@
 
                         $error = array(
-                            'error_code'    => $new_size_meta->get_error_code(),
+                            'error_code'    => $error_code,
                             'error_message' => $new_size_meta->get_error_message(),
                         );