Ticket #48451: 48451.diff

src/wp-admin/includes/image.php

@@ -282 +282 @@
                                 if ( true === $rotated && ! empty( $image_meta['image_meta']['orientation'] ) ) {
                                         $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.
                         }
@@ -317 +312 @@
                                 if ( ! empty( $image_meta['image_meta']['orientation'] ) ) {
                                         $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 );
         }
 
+        /**
+         * Runs at interim updates to the attachment metadata.
+         *
+         * May run several times while the metadata is being created and updated. For example when creating image sub-sizes
+         * after upload, or when creating additional image sub-sizes for an existing image.
+         *
+         * @since 5.3.0
+         *
+         * @param array $image_meta    The attachment metadata.
+         * @param int   $attachment_id Attachment post ID.
+         */
+        $image_meta = apply_filters( 'wp_interim_update_attachment_metadata', $image_meta, $attachment_id );
+
+        // 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.
+        update_post_meta( $attachment_id, '_wp_attachment_metadata', $image_meta );
+
         $new_sizes = wp_get_registered_image_subsizes();
 
         /**
@@ -424 +431 @@
                         } else {
                                 // Save the size meta value.
                                 $image_meta['sizes'][ $new_size_name ] = $new_size_meta;
-                                wp_update_attachment_metadata( $attachment_id, $image_meta );
+
+                                /** This filter is documented in wp-admin/includes/image.php */
+                                $image_meta = apply_filters( 'wp_interim_update_attachment_metadata', $image_meta, $attachment_id );
+
+                                // Save the updated metadata.
+                                // At this point some or all of the image sub-sizes have been created.
+                                update_post_meta( $attachment_id, '_wp_attachment_metadata', $image_meta );
                         }
                 }
         } else {
@@ -433 +446 @@
 
                 if ( ! empty( $created_sizes ) ) {
                         $image_meta['sizes'] = array_merge( $image_meta['sizes'], $created_sizes );
-                        wp_update_attachment_metadata( $attachment_id, $image_meta );
+
+                        /** This filter is documented in wp-admin/includes/image.php */
+                        $image_meta = apply_filters( 'wp_interim_update_attachment_metadata', $image_meta, $attachment_id );
+
+                        // Save the updated metadata.
+                        update_post_meta( $attachment_id, '_wp_attachment_metadata', $image_meta );
                 }
         }