Changeset 46651

Timestamp:

11/04/2019 05:05:53 PM (5 years ago)

Author:

azaozz

Message:

Upload: Ensure the new image meta is always saved before starting post-processing of an uploaded image, even if there was an error while scaling or rotating it.

See #48472.

File:

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

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

@@ -288 +288 @@
                     $image_meta['image_meta']['orientation'] = 1;
                 }
-
-                // Initial save of the new metadata when the original image was scaled.
-                // 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 );
             } else {
                 // TODO: log errors.
@@ -323 +318 @@
                     $image_meta['image_meta']['orientation'] = 1;
                 }
-
-                // Initial save of the new metadata when the original image was rotated.
-                wp_update_attachment_metadata( $attachment_id, $image_meta );
             } else {
                 // TODO: log errors.
             }
         }
-    } else {
-        // Initial save of the new metadata when the image was not scaled or rotated.
-        wp_update_attachment_metadata( $attachment_id, $image_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();