Changeset 29816

Timestamp:

10/02/2014 03:31:57 PM (10 years ago)

Author:

wonderboymusic

Message:

In wp_delete_attachment(): account for orphan sizes by looping over the sizes stored in metadata, instead of relying on the current sizes stored in $_wp_additional_image_sizes.

Props JoshuaAbenazer, desrosj, markoheijnen.
Fixes #24518.

File:

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

trunk/src/wp-includes/post.php

@@ -4772 +4772 @@
     $file = get_attached_file( $post_id );
 
-    $intermediate_sizes = array();
-    foreach ( get_intermediate_image_sizes() as $size ) {
-        if ( $intermediate = image_get_intermediate_size( $post_id, $size ) )
-            $intermediate_sizes[] = $intermediate;
-    }
-
     if ( is_multisite() )
         delete_transient( 'dirsize_cache' );
@@ -4826 +4820 @@
 
     // Remove intermediate and backup images if there are any.
-    foreach ( $intermediate_sizes as $intermediate ) {
-        /** This filter is documented in wp-admin/custom-header.php */
-        $intermediate_file = apply_filters( 'wp_delete_file', $intermediate['path'] );
-        @ unlink( path_join($uploadpath['basedir'], $intermediate_file) );
+    if ( isset( $meta['sizes'] ) && is_array( $meta['sizes'] ) ) {
+        foreach ( $meta['sizes'] as $size => $sizeinfo ) {
+            $intermediate_file = str_replace( basename( $file ), $sizeinfo['file'], $file );
+            /** This filter is documented in wp-admin/custom-header.php */
+            $intermediate_file = apply_filters( 'wp_delete_file', $intermediate_file );
+            @ unlink( path_join( $uploadpath['basedir'], $intermediate_file ) );
+        }
     }