Ticket #48522: 48522.2.diff

wp-admin/async-upload.php

@@ -90 +90 @@
         }
 }
 
-$id = media_handle_upload( 'async-upload', $post_id );
+try {
+        $id = media_handle_upload( 'async-upload', $post_id );
+} catch ( Exception $e ) {
+        printf(
+                '<div class="error-div error">%s <strong>%s</strong></div>',
+                sprintf(
+                        '<button type="button" class="dismiss button-link" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">%s</button>',
+                        __( 'Dismiss' )
+                ),
+                sprintf(
+                /* translators: %s: Name of the file that failed to upload. */
+                        __( '&#8220;%s&#8221;: %s.' ),
+                        esc_html( $_FILES['async-upload']['name'] ),
+                        $e->getMessage(),
+                )
+        );
+        exit;
+}
+
 if ( is_wp_error( $id ) ) {
         printf(
                 '<div class="error-div error">%s <strong>%s</strong><br />%s</div>',

wp-admin/includes/image.php

@@ -244 +244 @@
                 $image_meta['image_meta'] = $exif_meta;
         }
 
+        // Initial save of the new metadata.
+        // At this point the file was uploaded and moved to the uploads directory
+        // but the image sub-sizes haven't been created yet and the `sizes` array is empty.
+        wp_update_attachment_metadata( $attachment_id, $image_meta );
+
+        $new_sizes = wp_get_registered_image_subsizes();
+
+        /**
+         * Filters the image sizes automatically generated when uploading an image.
+         *
+         * @since 2.9.0
+         * @since 4.4.0 Added the `$image_meta` argument.
+         * @since 5.3.0 Added the `$attachment_id` argument.
+         *
+         * @param array $new_sizes     Associative array of image sizes to be created.
+         * @param array $image_meta    The image meta data: width, height, file, sizes, etc.
+         * @param int   $attachment_id The attachment post ID for the image.
+         */
+        $new_sizes = apply_filters( 'intermediate_image_sizes_advanced', $new_sizes, $image_meta, $attachment_id );
+
+        $image_meta = _wp_make_subsizes( $new_sizes, $file, $image_meta, $attachment_id );
+
         /**
          * Filters the "BIG image" threshold value.
          *
@@ -303 +325 @@
                                 // TODO: log errors.
                         }
                 } 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' ) {
+                                throw new Exception( __( 'Could not generate scaled image' ) );
+                        }
                 }
         } 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.
@@ -335 +363 @@
                 }
         }
 
-        // Initial save of the new metadata.
-        // At this point the file was uploaded and moved to the uploads directory
-        // but the image sub-sizes haven't been created yet and the `sizes` array is empty.
-        wp_update_attachment_metadata( $attachment_id, $image_meta );
-
-        $new_sizes = wp_get_registered_image_subsizes();
-
-        /**
-         * Filters the image sizes automatically generated when uploading an image.
-         *
-         * @since 2.9.0
-         * @since 4.4.0 Added the `$image_meta` argument.
-         * @since 5.3.0 Added the `$attachment_id` argument.
-         *
-         * @param array $new_sizes     Associative array of image sizes to be created.
-         * @param array $image_meta    The image meta data: width, height, file, sizes, etc.
-         * @param int   $attachment_id The attachment post ID for the image.
-         */
-        $new_sizes = apply_filters( 'intermediate_image_sizes_advanced', $new_sizes, $image_meta, $attachment_id );
-
-        return _wp_make_subsizes( $new_sizes, $file, $image_meta, $attachment_id );
+        return $image_meta;
 }
 
 /**