Improve deletion to use sources data when available, falling back to sizeinfo data

Author: adamsilverstein

src/wp-admin/includes/image.php

@@ -90,7 +90,7 @@ function wp_get_missing_image_subsizes( $attachment_id, $mime_type = '' ) {
 	}
 
 	if ( ! $mime_type ) {
-		$mime_type  = get_post_mime_type( get_post( $attachment_id ) );
+		$mime_type = get_post_mime_type( get_post( $attachment_id ) );
 	}
 
 	$registered_sizes = wp_get_registered_image_subsizes();
@@ -506,7 +506,7 @@ function _wp_make_subsizes( $new_sizes, $file, $image_meta, $attachment_id, $mim
 	}
 
 	if ( ! $mime_type ) {
-		$mime_type  = wp_get_image_mime( $file );
+		$mime_type = wp_get_image_mime( $file );
 	}
 
 	// Check if any of the new sizes already exist.

src/wp-includes/post.php

@@ -6446,30 +6446,27 @@ function wp_delete_attachment_files( $post_id, $meta, $backup_sizes, $file ) {
 		}
 	}
 
-	$primary_mime = isset( $meta['mime_type'] ) ? $meta['mime_type'] : false;
-
 	// Remove intermediate and backup images if there are any.
 	if ( isset( $meta['sizes'] ) && is_array( $meta['sizes'] ) ) {
 		$intermediate_dir = path_join( $uploadpath['basedir'], dirname( $file ) );
 
 		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'] ) && $primary_mime ) {
+			if ( isset( $sizeinfo['sources'] ) && is_array( $sizeinfo['sources'] ) ) {
 				foreach ( $sizeinfo['sources'] as $mime => $properties ) {
-					if ( $mime === $primary_mime || ! is_array( $properties ) || empty( $properties['file'] ) ) {
-						continue;
+					$intermediate_file = str_replace( wp_basename( $file ), $properties['file'], $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 );
 
-					$intermediate_file = str_replace( wp_basename( $file ), $properties['file'], $file );
 					if ( ! wp_delete_file_from_directory( $intermediate_file, $intermediate_dir ) ) {
 						$deleted = false;
 					}