Changeset 54085 for trunk/src/wp-includes/post.php

Timestamp:

09/06/2022 09:11:41 PM (2 years ago)

Author:

adamsilverstein

Message:

Media: revert the multi-mime feature.

This feature isn't quite ready to land.

Reverts r53786, r53848, r53847, r53845, r53751.

Props flixos90, azaozz, dd32.
See #55443.

File:

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

trunk/src/wp-includes/post.php

@@ -6487 +6487 @@
 
         foreach ( $meta['sizes'] as $size => $sizeinfo ) {
-
-            // 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;
-                    }
+            $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;
                 }
             }
@@ -6530 +6515 @@
     }
 
-    // Delete the full size images from 'sources' if available, or the root file.
-    if ( isset( $meta['sources'] ) && is_array( $meta['sources'] ) ) {
-        $sources          = $meta['sources'];
-        $intermediate_dir = path_join( $uploadpath['basedir'], dirname( $file ) );
-        foreach ( $sources as $mime => $properties ) {
-            if ( ! 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 {
-        if ( ! wp_delete_file_from_directory( $file, $uploadpath['basedir'] ) ) {
-            $deleted = false;
-        }
-    }
-
     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 ) {
-            // 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;
-                    }
+            $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;
     }