Ticket #48522: 48522.diff

src/wp-admin/includes/image.php

@@ -301 +301 @@
                                 }
                         } else {
                                 // TODO: log errors.
+                                $error_code = $saved->get_error_code();
+                                trigger_error( $error_code, E_USER_ERROR );
+                                exit;
                         }
                 } else {
-                        // TODO: log errors.
+                        $error_code = $resized->get_error_code();
+
+                        // The `error_getting_dimensions` error code means the original image is not large enough
+                        // to create the requested sub-size. (Checked here for completeness.)
+                        if ( $error_code !== 'error_getting_dimensions' ) {
+                                // TODO: log errors.
+                                trigger_error( $error_code, E_USER_ERROR );
+                                exit;
+                        }
                 }
         } elseif ( ! empty( $exif_meta['orientation'] ) && (int) $exif_meta['orientation'] !== 1 ) {
                 // Rotate the whole original image if there is EXIF data and "orientation" is not 1.
@@ -331 +342 @@
                                 }
                         } else {
                                 // TODO: log errors.
+                                $error_code = $saved->get_error_code();
+                                trigger_error( $error_code, E_USER_ERROR );
+                                exit;
                         }
                 }
         }
@@ -423 +437 @@
 
                 if ( is_wp_error( $rotated ) ) {
                         // TODO: log errors.
+                        $error_code = $rotated->get_error_code();
+                        trigger_error( $error_code, E_USER_ERROR );
+                        exit;
                 }
         }
 
@@ -431 +448 @@
                         $new_size_meta = $editor->make_subsize( $new_size_data );
 
                         if ( is_wp_error( $new_size_meta ) ) {
-                                // TODO: log errors.
+                                $error_code = $new_size_meta->get_error_code();
+
+                                // The `error_getting_dimensions` error code means the original image is not large enough
+                                // to create the requested sub-size.
+                                if ( $error_code !== 'error_getting_dimensions' ) {
+                                        // TODO: log errors.
+                                        trigger_error( $error_code, E_USER_ERROR );
+                                        exit;
+                                }
                         } else {
                                 // Save the size meta value.
                                 $image_meta['sizes'][ $new_size_name ] = $new_size_meta;