Changeset 53751

Timestamp:

07/21/2022 06:01:01 PM (2 years ago)

Author:

adamsilverstein

Message:

Media: enable generating multiple mime types for image uploads; specifically WebP versions for JPEG images by default.

This changeset adds the capability for core media uploads to generate sub sized images in more than a single mime type. The output formats for each mime type can be controlled through a filter. WebP is used as an additional output format for JPEG images by default to improve front end performance.

When generating additional mime types, only images which are smaller than the respective original are retained. By default, additional mime type images are only generated for the built-in core image sizes and any custom sizes that have opted in.

Image meta is updated with a new 'sources' array containing file details for each mime type. Each image size in the 'sizes' array also gets a new 'sources' array that contains the image file details for each mime type.

This change also increases image upload retries to accommodate additional image sizes. It also adds a $mime_type parameter to the wp_get_missing_image_subsizes function and filter.

This change adds three new filters to enable full control of secondary mime image generation and output:

• A new filter wp_image_sizes_with_additional_mime_type_support that filters the sizes that support secondary mime type output. Developers can use this to control the output of additional mime type sub-sized images on a per size basis.
• A new filter wp_upload_image_mime_transforms that filters the output mime types for a given input mime type. Developers can use this to control generation of additional mime types for a given input mime type or even override the original mime type.
• A new filter wp_content_image_mimes which controls image mime type output selection and order for frontend content. Developers can use this to control the mime type output preference order for content images. Content images inserted from the media library will use the available image versions based on the order from this filter.

Thanks to the many contributors who helped develop, test and give feedback on this feature.

A haiku to summarize:

Upload a JPEG
Images of all sizes
Output as WebPs

Props flixos90, MatthiasReinholz, studiolxv, markhowellsmead, eatingrules, pbiron, mukesh27, joegrainger, mehulkaklotar, tweetythierry, akshitsethi, peterwilsoncc, eugenemanuilov, mitogh, shetheliving, clarkeemily, codekraft, mikeschroder, clorith, kasparsd, spacedmonkey, trevorpfromsandee, jb510, scofennellgmailcom, seedsca, cagsmith, karinclimber, dainemawer, baxbridge, grapplerulrich, sobatkras, chynnabenton, tonylocalword, barneydavey, kwillmorth, garymatthews919, olliejones, imarkinteractive, jeffpaul, feastdesignco, webbeetle, masteradhoc.

See #55443.

Location:

trunk

Files:

• src/js/_enqueues/vendor/plupload/handlers.js (modified) (1 diff)
• src/js/_enqueues/vendor/plupload/wp-plupload.js (modified) (1 diff)
• src/wp-admin/includes/image.php (modified) (20 diffs)
• src/wp-includes/class-wp-image-editor.php (modified) (4 diffs)
• src/wp-includes/media.php (modified) (2 diffs)
• src/wp-includes/post.php (modified) (2 diffs)
• tests/phpunit/data/images/test-image-rotated-90ccw.jpg (added)
• tests/phpunit/data/images/test-image-rotated-90cw.webp (added)
• tests/phpunit/data/images/test-image.jpeg (added)
• tests/phpunit/tests/image/editor.php (modified) (4 diffs)
• tests/phpunit/tests/image/functions.php (modified) (14 diffs)
• tests/phpunit/tests/media.php (modified) (15 diffs)

trunk/src/js/_enqueues/vendor/plupload/handlers.js

@@ -487 +487 @@
         times = tryAgainCount[ file.id ];
 
-        if ( times && times > 4 ) {
+        if ( times && times >  ) {
             /*
              * The file may have been uploaded and attachment post created,

trunk/src/js/_enqueues/vendor/plupload/wp-plupload.js

@@ -139 +139 @@
             times = tryAgainCount[ file.id ];
 
-            if ( times && times > 4 ) {
+            if ( times && times >  ) {
                 /*
                  * The file may have been uploaded and attachment post created,

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

@@ -78 +78 @@
  *
  * @since 5.3.0
- *
- * @param int $attachment_id The image attachment post ID.
+ * @since 6.1.0 The $mime_type parameter was added.
+ *
+ * @param int    $attachment_id The image attachment post ID.
+ * @param string $mime_type     Optional. The mime type to check for missing sizes. Default is the primary image mime.
  * @return array[] Associative array of arrays of image sub-size information for
  *                 missing image sizes, keyed by image size name.
  */
-function wp_get_missing_image_subsizes( $attachment_id ) {
+function wp_get_missing_image_subsizes( $attachment_id ) {
     if ( ! wp_attachment_is_image( $attachment_id ) ) {
         return array();
+
+
+
+
+
     }
 
@@ -130 +137 @@
      * as the image may have been used in an older post.
      */
-    $missing_sizes = array_diff_key( $possible_sizes, $image_meta['sizes'] );
+    $missing_sizes = array();
+    foreach ( $possible_sizes as $size_name => $size_data ) {
+        if ( ! isset( $image_meta['sizes'][ $size_name ] ) ) {
+            $missing_sizes[ $size_name ] = $size_data;
+            continue;
+        }
+
+        if ( ( isset( $size_data['mime-type'] ) && $size_data['mime-type'] === $mime_type ) || isset( $size_data['sources'][ $mime_type ] ) ) {
+            continue;
+        }
+
+        $missing_sizes[ $size_name ] = $size_data;
+    }
+
+    // Filter secondary mime types to those sizes that are enabled.
+    if ( $primary_mime_type !== $mime_type ) {
+        $missing_sizes = _wp_filter_image_sizes_additional_mime_type_support( $missing_sizes, $attachment_id );
+    }
 
     /**
@@ -136 +160 @@
      *
      * @since 5.3.0
+
      *
      * @param array[] $missing_sizes Associative array of arrays of image sub-size information for
@@ -141 +166 @@
      * @param array   $image_meta    The image meta data.
      * @param int     $attachment_id The image attachment post ID.
+
      */
-    return apply_filters( 'wp_get_missing_image_subsizes', $missing_sizes, $image_meta, $attachment_id );
+    return apply_filters( 'wp_get_missing_image_subsizes', $missing_sizes, $image_meta, $attachment_id );
 }
 
@@ -150 +176 @@
  *
  * @since 5.3.0
+
  *
  * @param int $attachment_id The image attachment post ID.
@@ -168 +195 @@
         }
     } else {
-        $missing_sizes = wp_get_missing_image_subsizes( $attachment_id );
-
-        if ( empty( $missing_sizes ) ) {
-            return $image_meta;
-        }
-
-        // This also updates the image meta.
-        $image_meta = _wp_make_subsizes( $missing_sizes, $image_file, $image_meta, $attachment_id );
+        // Get the primary and additional mime types to generate.
+        list( $primary_mime_type, $additional_mime_types ) = _wp_get_primary_and_additional_mime_types( $image_file, $attachment_id );
+
+        // Generate missing 'full' image files for additional mime types.
+        if ( ! empty( $additional_mime_types ) ) {
+            if ( isset( $image_meta['sources'] ) ) {
+                $missing_mime_types = array_diff( $additional_mime_types, array_keys( $image_meta['sources'] ) );
+            } else {
+                $missing_mime_types = $additional_mime_types;
+            }
+            if ( ! empty( $missing_mime_types ) ) {
+                $image_meta = _wp_make_additional_mime_types( $missing_mime_types, $image_file, $image_meta, $attachment_id );
+            }
+        }
+
+        // Generate missing image sub-sizes for each mime type.
+        $all_mime_types = array_merge( array( $primary_mime_type ), $additional_mime_types );
+        foreach ( $all_mime_types as $mime_type ) {
+            $missing_sizes = wp_get_missing_image_subsizes( $attachment_id, $mime_type );
+
+            if ( empty( $missing_sizes ) ) {
+                continue;
+            }
+
+            // This also updates the image meta.
+            $image_meta = _wp_make_subsizes( $missing_sizes, $image_file, $image_meta, $attachment_id, $mime_type );
+        }
     }
 
@@ -223 +269 @@
 
 /**
- * Creates image sub-sizes, adds the new data to the image meta `sizes` array, and updates the image metadata.
+ * Creates image sub-sizes, adds the new data to the image meta `sizes` array, and updates the image metadata.
  *
  * Intended for use after an image is uploaded. Saves/updates the image metadata after each
@@ -229 +275 @@
  *
  * @since 5.3.0
+
  *
  * @param string $file          Full path to the image file.
@@ -249 +296 @@
         'filesize' => wp_filesize( $file ),
         'sizes'    => array(),
+
     );
 
@@ -258 +306 @@
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     // Do not scale (large) PNG images. May result in sub-sizes that have greater file size than the original. See #48736.
-    if ( 'image/png' !== $imagesize['mime'] ) {
-
+    if ( 'image/png' !== $mime_type ) {
         /**
          * Filters the "BIG image" threshold value.
@@ -286 +437 @@
         // If the original image's dimensions are over the threshold,
         // scale the image and use it as the "full" size.
-        if ( $threshold && ( $image_meta['width'] > $threshold || $image_meta['height'] > $threshold ) ) {
-            $editor = wp_get_image_editor( $file );
-
-            if ( is_wp_error( $editor ) ) {
-                // This image cannot be edited.
-                return $image_meta;
-            }
-
+        if ( $threshold && ( $imagesize[0] > $threshold || $imagesize[1] > $threshold ) ) {
             // Resize the image.
             $resized = $editor->resize( $threshold, $threshold );
-            $rotated = null;
 
             // If there is EXIF data, rotate according to EXIF Orientation.
             if ( ! is_wp_error( $resized ) && is_array( $exif_meta ) ) {
-                $resized = $editor->maybe_exif_rotate();
-                $rotated = $resized;
-            }
-
-            if ( ! is_wp_error( $resized ) ) {
-                // Append "-scaled" to the image file name. It will look like "my_image-scaled.jpg".
-                // This doesn't affect the sub-sizes names as they are generated from the original image (for best quality).
-                $saved = $editor->save( $editor->generate_filename( 'scaled' ) );
-
-                if ( ! is_wp_error( $saved ) ) {
-                    $image_meta = _wp_image_meta_replace_original( $saved, $file, $image_meta, $attachment_id );
-
-                    // If the image was rotated update the stored EXIF data.
-                    if ( true === $rotated && ! empty( $image_meta['image_meta']['orientation'] ) ) {
-                        $image_meta['image_meta']['orientation'] = 1;
-                    }
-                } else {
-                    // TODO: Log errors.
-                }
-            } else {
-                // TODO: Log errors.
+                $rotated = $editor->maybe_exif_rotate();
             }
         } elseif ( ! empty( $exif_meta['orientation'] ) && 1 !== (int) $exif_meta['orientation'] ) {
             // Rotate the whole original image if there is EXIF data and "orientation" is not 1.
-
-            $editor = wp_get_image_editor( $file );
-
-            if ( is_wp_error( $editor ) ) {
-                // This image cannot be edited.
-                return $image_meta;
-            }
-
-            // Rotate the image.
             $rotated = $editor->maybe_exif_rotate();
-
-            if ( true === $rotated ) {
-                // Append `-rotated` to the image file name.
-                $saved = $editor->save( $editor->generate_filename( 'rotated' ) );
-
-                if ( ! is_wp_error( $saved ) ) {
-                    $image_meta = _wp_image_meta_replace_original( $saved, $file, $image_meta, $attachment_id );
-
-                    // Update the stored EXIF data.
-                    if ( ! empty( $image_meta['image_meta']['orientation'] ) ) {
-                        $image_meta['image_meta']['orientation'] = 1;
-                    }
-                } else {
-                    // TODO: Log errors.
-                }
-            }
-        }
-    }
-
-    /*
-     * 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 array( $editor, $resized, $rotated );
+}
+
+/**
+ * Gets the suffix to use for image files based on resizing and rotating.
+ *
+ * @since 6.1.0
+ * @access private
+ *
+ * @param bool|WP_Error Whether the image was resized, or an error if resizing failed.
+ * @param bool|WP_Error Whether the image was rotated, or an error if rotating failed.
+ * @return string The suffix to use for the file name, or empty string if none.
+ */
+function _wp_get_image_suffix( $resized, $rotated ) {
+    if ( $resized && ! is_wp_error( $resized ) ) {
+        // Append "-scaled" to the image file name. It will look like "my_image-scaled.jpg".
+        // This doesn't affect the sub-sizes names as they are generated from the original image (for best quality).
+        return 'scaled';
+    }
+
+    if ( true === $rotated ) {
+        // Append `-rotated` to the image file name.
+        return 'rotated';
+    }
+
+    if ( is_wp_error( $resized ) || is_wp_error( $rotated ) ) {
+        // TODO: Log errors.
+    }
+    return '';
+}
+
+/**
+ * Gets a sources array element from a meta.
+ *
+ * @since 6.1.0
+ * @access private
+ *
+ * @param array $meta The meta to get the source from.
+ * @return array The source array element.
+ */
+function _wp_get_sources_from_meta( $meta ) {
+    return array(
+        'file'     => isset( $meta['file'] ) ? wp_basename( $meta['file'] ) : '',
+        'filesize' => isset( $meta['filesize'] ) ? $meta['filesize'] : wp_filesize( $meta['path'] ),
+    );
 }
 
@@ -385 +505 @@
  *
  * @since 5.3.0
+
  * @access private
  *
- * @param array  $new_sizes     Array defining what sizes to create.
- * @param string $file          Full path to the image file.
- * @param array  $image_meta    The attachment meta data array.
- * @param int    $attachment_id Attachment ID to process.
+ * @param array  $new_sizes       Array defining what sizes to create.
+ * @param string $file            Full path to the image file.
+ * @param array  $image_meta      The attachment meta data array.
+ * @param int    $attachment_id   Attachment ID to process.
+ * @param string $mime_type       Optional. The mime type to check for missing sizes. Default is the image mime of $file.
  * @return array The attachment meta data with updated `sizes` array. Includes an array of errors encountered while resizing.
  */
-function _wp_make_subsizes( $new_sizes, $file, $image_meta, $attachment_id ) {
+function _wp_make_subsizes( $new_sizes, $file, $image_meta, $attachment_id ) {
     if ( empty( $image_meta ) || ! is_array( $image_meta ) ) {
         // Not an image attachment.
         return array();
+
+
+
+
     }
 
@@ -408 +534 @@
              */
             if ( array_key_exists( $size_name, $new_sizes ) ) {
-                unset( $new_sizes[ $size_name ] );
+                // Unset the size if it is either the required mime type already exists either as main mime type or
+                // within sources.
+                if ( $size_meta['mime-type'] === $mime_type || isset( $size_meta['sources'][ $mime_type ] ) ) {
+                    unset( $new_sizes[ $size_name ] );
+                }
             }
         }
@@ -434 +564 @@
     $new_sizes = array_filter( array_merge( $priority, $new_sizes ) );
 
-    $editor = wp_get_image_editor( $file );
+    $editor = wp_get_image_editor( $file );
 
     if ( is_wp_error( $editor ) ) {
@@ -440 +570 @@
         return $image_meta;
     }
+
+
 
     // If stored EXIF data exists, rotate the source image before creating sub-sizes.
@@ -458 +590 @@
             } else {
                 // Save the size meta value.
-                $image_meta['sizes'][ $new_size_name ] = $new_size_meta;
+                if ( ! isset( $image_meta['sizes'][ $new_size_name ] ) ) {
+                    $image_meta['sizes'][ $new_size_name ] = $new_size_meta;
+                } else {
+                    // Remove any newly generated images that are larger than the primary mime type.
+                    $new_size     = isset( $new_size_meta['filesize'] ) ? $new_size_meta['filesize'] : 0;
+                    $primary_size = isset( $image_meta['sizes'][ $new_size_name ]['filesize'] ) ? $image_meta['sizes'][ $new_size_name ]['filesize'] : 0;
+
+                    if ( $new_size && $primary_size && $new_size >= $primary_size ) {
+                        wp_delete_file( dirname( $file ) . '/' . $new_size_meta['file'] );
+                        continue;
+                    }
+                }
+                if ( ! isset( $image_meta['sizes'][ $new_size_name ]['sources'] ) ) {
+                    $image_meta['sizes'][ $new_size_name ]['sources'] = array();
+                }
+                $image_meta['sizes'][ $new_size_name ]['sources'][ $mime_type ] = _wp_get_sources_from_meta( $new_size_meta );
                 wp_update_attachment_metadata( $attachment_id, $image_meta );
             }
@@ -467 +614 @@
 
         if ( ! empty( $created_sizes ) ) {
-            $image_meta['sizes'] = array_merge( $image_meta['sizes'], $created_sizes );
+            foreach ( $created_sizes as $created_size_name => $created_size_meta ) {
+
+                // Primary mime type is set in 'sizes' array.
+                if ( ! isset( $image_meta['sizes'][ $created_size_name ] ) ) {
+                    $image_meta['sizes'][ $created_size_name ] = $created_size_meta;
+                } else {
+                    // Remove any newly generated images that are larger than the primary mime type.
+                    $new_size     = isset( $created_size_meta['filesize'] ) ? $created_size_meta['filesize'] : 0;
+                    $primary_size = isset( $image_meta['sizes'][ $created_size_name ]['filesize'] ) ? $image_meta['sizes'][ $created_size_name ]['filesize'] : 0;
+
+                    if ( $new_size && $primary_size && $new_size >= $primary_size ) {
+                        wp_delete_file( dirname( $file ) . '/' . $created_size_meta['file'] );
+                        continue;
+                    }
+                }
+                if ( ! isset( $image_meta['sizes'][ $created_size_name ]['sources'] ) ) {
+                    $image_meta['sizes'][ $created_size_name ]['sources'] = array();
+                }
+                $image_meta['sizes'][ $created_size_name ]['sources'][ $mime_type ] = _wp_get_sources_from_meta( $new_size_meta );
+            }
             wp_update_attachment_metadata( $attachment_id, $image_meta );
         }
@@ -473 +639 @@
 
     return $image_meta;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -631 +916 @@
 
                     // Create sub-sizes saving the image meta after each.
-                    $metadata = _wp_make_subsizes( $merged_sizes, $image_file, $metadata, $attachment_id );
+                    $metadata = _wp_make_subsizes( $merged_sizes, $image_file, $metadata, $attachment_id );
                 }
             }
@@ -1158 +1443 @@
     return $dst_file;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/src/wp-includes/class-wp-image-editor.php

@@ -334 +334 @@
     protected function get_output_format( $filename = null, $mime_type = null ) {
         $new_ext = null;
+
+
+
+
+
 
         // By default, assume specified type takes priority.
@@ -426 +431 @@
 
     /**
-     * Builds an output filename based on current file, and adding proper suffix
-     *
-     * @since 3.5.0
-     *
-     * @param string $suffix
-     * @param string $dest_path
-     * @param string $extension
-     * @return string filename
+     * Builds an output filename based on current file, and adding proper suffix.
+     *
+     * @since 3.5.0
+     * @since 6.1.0 Skips adding a suffix when set to an empty string. When the
+     *              file extension being generated doesn't match the image file extension,
+     *              add the extension to the suffix
+     *
+     * @param string $suffix    Optional. Suffix to add to the filename. The default null
+     *                          will result in a 'widthxheight' suffix. Passing
+     *                          an empty string will result in no suffix.
+     * @param string $dest_path Optional. The path to save the file to. The default null
+     *                          will use the image file path.
+     * @param string $extension Optional. The file extension to use. The default null
+     *                          will use the image file extension.
+     * @return string filename The generated file name.
      */
     public function generate_filename( $suffix = null, $dest_path = null, $extension = null ) {
         // $suffix will be appended to the destination filename, just before the extension.
-        if ( ! $suffix ) {
+        if (  $suffix ) {
             $suffix = $this->get_suffix();
         }
@@ -458 +470 @@
         }
 
-        return trailingslashit( $dir ) . "{$name}-{$suffix}.{$new_ext}";
+        if ( empty( $suffix ) ) {
+            $suffix = '';
+        } else {
+            $suffix = "-{$suffix}";
+        }
+
+        // When the file extension being generated doesn't match the image file extension,
+        // add the extension to the suffix to ensure a unique file name. Prevents
+        // name conflicts when a single image type can have multiple extensions,
+        // eg. .jpg, .jpeg and .jpe are all valid JPEG extensions.
+        if ( ! empty( $extension ) && $extension !== $ext ) {
+            $suffix .= "-{$ext}";
+        }
+
+        return trailingslashit( $dir ) . "{$name}{$suffix}.{$new_ext}";
     }
 
@@ -638 +664 @@
         return wp_get_default_extension_for_mime_type( $mime_type );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
-

trunk/src/wp-includes/media.php

@@ -1853 +1853 @@
             }
 
+
+
+
+
+
             /**
              * Filters an img tag within the content for a given context.
@@ -1897 +1902 @@
 
     return $content;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 

trunk/src/wp-includes/post.php

@@ -6482 +6482 @@
 
         foreach ( $meta['sizes'] as $size => $sizeinfo ) {
-            $intermediate_file = str_replace( wp_basename( $file ), $sizeinfo['file'], $file );
-
-            if ( ! empty( $intermediate_file ) ) {
-                $intermediate_file = path_join( $uploadpath['basedir'], $intermediate_file );
-
-                if ( ! wp_delete_file_from_directory( $intermediate_file, $intermediate_dir ) ) {
-                    $deleted = false;
+
+            // Check for alternate size mime types in the sizeinfo['sources'] array to delete.
+            if ( isset( $sizeinfo['sources'] ) && is_array( $sizeinfo['sources'] ) ) {
+                foreach ( $sizeinfo['sources'] as $mime => $properties ) {
+                    $intermediate_file = str_replace( wp_basename( $file ), $properties['file'], $file );
+                    if ( ! empty( $intermediate_file ) ) {
+                        $intermediate_file = path_join( $uploadpath['basedir'], $intermediate_file );
+                        if ( ! wp_delete_file_from_directory( $intermediate_file, $intermediate_dir ) ) {
+                            $deleted = false;
+                        }
+                    }
+                }
+            } else {
+                // Otherwise, delete files from the sizeinfo data.
+                $intermediate_file = str_replace( wp_basename( $file ), $sizeinfo['file'], $file );
+
+                if ( ! empty( $intermediate_file ) ) {
+                    $intermediate_file = path_join( $uploadpath['basedir'], $intermediate_file );
+
+                    if ( ! wp_delete_file_from_directory( $intermediate_file, $intermediate_dir ) ) {
+                        $deleted = false;
+                    }
                 }
             }
@@ -6510 +6525 @@
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     if ( is_array( $backup_sizes ) ) {
+
         $del_dir = path_join( $uploadpath['basedir'], dirname( $meta['file'] ) );
-
+        // Delete the root (edited) file which was not deleted above.
+        if ( ! wp_delete_file_from_directory( $file, $uploadpath['basedir'] ) ) {
+            $deleted = false;
+        }
         foreach ( $backup_sizes as $size ) {
-            $del_file = path_join( dirname( $meta['file'] ), $size['file'] );
-
-            if ( ! empty( $del_file ) ) {
-                $del_file = path_join( $uploadpath['basedir'], $del_file );
-
-                if ( ! wp_delete_file_from_directory( $del_file, $del_dir ) ) {
-                    $deleted = false;
+            // Delete files from 'sources' data if available, otherwise from 'sizes' data.
+            if ( isset( $meta['sources'] ) && is_array( $meta['sources'] ) ) {
+                // Delete any backup images stored in the 'sources' array.
+                if ( isset( $size['sources'] ) && is_array( $size['sources'] ) ) {
+                    foreach ( $size['sources'] as $mime => $properties ) {
+                        $del_file = path_join( dirname( $meta['file'] ), $properties['file'] );
+                        if ( ! empty( $del_file ) ) {
+                            $del_file = path_join( $uploadpath['basedir'], $del_file );
+                            if ( ! wp_delete_file_from_directory( $del_file, $del_dir ) ) {
+                                $deleted = false;
+                            }
+                        }
+                    }
+                }
+            } else {
+                $del_file = path_join( dirname( $meta['file'] ), $size['file'] );
+
+                if ( ! empty( $del_file ) ) {
+                    $del_file = path_join( $uploadpath['basedir'], $del_file );
+                    if ( ! wp_delete_file_from_directory( $del_file, $del_dir ) ) {
+                        $deleted = false;
+                    }
                 }
             }
         }
-    }
-
-    if ( ! wp_delete_file_from_directory( $file, $uploadpath['basedir'] ) ) {
-        $deleted = false;
     }
 

trunk/tests/phpunit/tests/image/editor.php

@@ -132 +132 @@
 
         // Removing PNG to WEBP conversion on save. Quality setting should reset to the default.
+
         remove_filter( 'image_editor_output_format', array( $this, 'image_editor_output_formats' ) );
         $editor->save();
@@ -155 +156 @@
 
         // After removing the conversion the quality setting should reset to the filtered value for the original image type, JPEG.
+
         remove_filter( 'image_editor_output_format', array( $this, 'image_editor_output_formats' ) );
         $editor->save();
@@ -227 +229 @@
 
         // Test with a suffix only.
-        $this->assertSame( 'canola-100x50.png', wp_basename( $editor->generate_filename( null, null, 'png' ) ) );
+        $this->assertSame( 'canola-100x50.png', wp_basename( $editor->generate_filename( null, null, 'png' ) ) );
 
         // Combo!
-        $this->assertSame( trailingslashit( realpath( get_temp_dir() ) ) . 'canola-new.png', $editor->generate_filename( 'new', realpath( get_temp_dir() ), 'png' ) );
+        $this->assertSame( trailingslashit( realpath( get_temp_dir() ) ) . 'canola-new.png', $editor->generate_filename( 'new', realpath( get_temp_dir() ), 'png' ) );
 
         // Test with a stream destination.
@@ -363 +365 @@
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

trunk/tests/phpunit/tests/image/functions.php

@@ -640 +640 @@
         }
 
+
+
+
         $orig_file = DIR_TESTDATA . '/images/wordpress-gsoc-flyer.pdf';
         $test_file = get_temp_dir() . 'wordpress-gsoc-flyer.pdf';
@@ -678 +681 @@
                     'mime-type' => 'image/jpeg',
                     'filesize'  => wp_filesize( $temp_dir . 'wordpress-gsoc-flyer-pdf-232x300.jpg' ),
+
+
+
+
+
+
                 ),
                 'large'     => array(
@@ -685 +694 @@
                     'mime-type' => 'image/jpeg',
                     'filesize'  => wp_filesize( $temp_dir . 'wordpress-gsoc-flyer-pdf-791x1024.jpg' ),
+
+
+
+
+
+
                 ),
                 'thumbnail' => array(
@@ -692 +707 @@
                     'mime-type' => 'image/jpeg',
                     'filesize'  => wp_filesize( $temp_dir . 'wordpress-gsoc-flyer-pdf-116x150.jpg' ),
+
+
+
+
+
+
                 ),
             ),
@@ -703 +724 @@
             unlink( $temp_dir . $size['file'] );
         }
+
     }
 
@@ -716 +738 @@
 
         update_option( 'medium_crop', 1 );
+
+
+
 
         $orig_file = DIR_TESTDATA . '/images/wordpress-gsoc-flyer.pdf';
@@ -755 +780 @@
                     'mime-type' => 'image/jpeg',
                     'filesize'  => wp_filesize( $temp_dir . 'wordpress-gsoc-flyer-pdf-300x300.jpg' ),
+
+
+
+
+
+
                 ),
                 'large'     => array(
@@ -762 +793 @@
                     'mime-type' => 'image/jpeg',
                     'filesize'  => wp_filesize( $temp_dir . 'wordpress-gsoc-flyer-pdf-791x1024.jpg' ),
+
+
+
+
+
+
+
                 ),
                 'thumbnail' => array(
@@ -769 +807 @@
                     'mime-type' => 'image/jpeg',
                     'filesize'  => wp_filesize( $temp_dir . 'wordpress-gsoc-flyer-pdf-116x150.jpg' ),
+
+
+
+
+
+
                 ),
             ),
@@ -780 +824 @@
             unlink( $temp_dir . $size['file'] );
         }
+
+
     }
 
@@ -789 +835 @@
             $this->markTestSkipped( 'Rendering PDFs is not supported on this system.' );
         }
+
+
+
 
         $orig_file = DIR_TESTDATA . '/images/wordpress-gsoc-flyer.pdf';
@@ -822 +871 @@
             'mime-type' => 'image/jpeg',
             'filesize'  => wp_filesize( $temp_dir . 'wordpress-gsoc-flyer-pdf-77x100.jpg' ),
+
+
+
+
+
+
         );
 
@@ -837 +892 @@
             unlink( $temp_dir . $size['file'] );
         }
+
     }
 
@@ -1027 +1083 @@
         );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

trunk/tests/phpunit/tests/media.php

@@ -2252 +2252 @@
         add_filter( 'wp_img_tag_add_width_and_height_attr', '__return_false' );
         add_filter( 'wp_img_tag_add_loading_attr', '__return_false' );
+
 
         $this->assertSame( $content_filtered, wp_filter_content_tags( $content_unfiltered ) );
@@ -2257 +2258 @@
         remove_filter( 'wp_img_tag_add_width_and_height_attr', '__return_false' );
         remove_filter( 'wp_img_tag_add_loading_attr', '__return_false' );
+
+
     }
 
@@ -2290 +2293 @@
         $img = wp_img_tag_add_decoding_attr( $img, 'the_content' );
         $img = preg_replace( '|<img ([^>]+) />|', '<img $1 ' . 'srcset="image2x.jpg 2x" />', $img );
+
 
         // The content filter should return the image unchanged.
         $this->assertSame( $img, wp_filter_content_tags( $img ) );
+
+
     }
 
@@ -2362 +2368 @@
         add_filter( 'wp_img_tag_add_srcset_and_sizes_attr', '__return_false' );
         add_filter( 'wp_img_tag_add_decoding_attr', '__return_false' );
+
 
         add_filter(
@@ -2424 +2431 @@
      */
     public function test_wp_filter_content_tags_schemes() {
+
         $image_meta = wp_get_attachment_metadata( self::$large_id );
         $size_array = $this->get_image_size_array_from_meta( $image_meta, 'medium' );
@@ -2469 +2477 @@
 
         $this->assertSame( $expected, $actual );
+
     }
 
@@ -2962 +2971 @@
         add_filter( 'wp_img_tag_add_loading_attr', '__return_false' );
         add_filter( 'wp_img_tag_add_srcset_and_sizes_attr', '__return_false' );
+
 
         $this->assertSame( $content_filtered, wp_filter_content_tags( $content_unfiltered ) );
@@ -2967 +2977 @@
         remove_filter( 'wp_img_tag_add_loading_attr', '__return_false' );
         remove_filter( 'wp_img_tag_add_srcset_and_sizes_attr', '__return_false' );
+
     }
 
@@ -3042 +3053 @@
         add_filter( 'wp_img_tag_add_width_and_height_attr', '__return_false' );
         add_filter( 'wp_img_tag_add_srcset_and_sizes_attr', '__return_false' );
+
 
         $this->assertSame( $content_filtered, wp_filter_content_tags( $content_unfiltered ) );
@@ -3047 +3059 @@
         remove_filter( 'wp_img_tag_add_width_and_height_attr', '__return_false' );
         remove_filter( 'wp_img_tag_add_srcset_and_sizes_attr', '__return_false' );
+
     }
 
@@ -3075 +3088 @@
         add_filter( 'wp_lazy_loading_enabled', '__return_true' );
 
+
+
         $this->assertSame( $content_filtered, wp_filter_content_tags( $content_unfiltered ) );
         remove_filter( 'wp_lazy_loading_enabled', '__return_true' );
         remove_filter( 'wp_img_tag_add_srcset_and_sizes_attr', '__return_false' );
+
+
     }
 
@@ -3102 +3119 @@
         add_filter( 'wp_lazy_loading_enabled', '__return_false' );
 
+
+
         $this->assertSame( $content, wp_filter_content_tags( $content ) );
         remove_filter( 'wp_lazy_loading_enabled', '__return_false' );
         remove_filter( 'wp_img_tag_add_srcset_and_sizes_attr', '__return_false' );
+
     }
 
@@ -3530 +3550 @@
     function test_wp_filter_content_tags_with_wp_get_loading_attr_default() {
         global $wp_query, $wp_the_query;
+
 
         $img1         = get_image_tag( self::$large_id, '', '', '', 'large' );
@@ -3565 +3586 @@
             remove_filter( 'wp_img_tag_add_srcset_and_sizes_attr', '__return_false' );
         }
+
 
         // After filtering, the first image should not be lazy-loaded while the other ones should be.
@@ -3614 +3636 @@
         remove_filter( 'wp_omit_loading_attr_threshold', '__return_null', 100 );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }