Changeset 20770

Timestamp:

05/11/2012 06:47:32 PM (13 years ago)

Author:

ryan

Message:

Collect intermediate images before deleting an attachment and its meta. Fixes thumbnail deletion. Props SergeyBiryukov. fixes #20658

File:

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

trunk/wp-includes/post.php

@@ -3824 +3824 @@
     $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' );
@@ -3858 +3864 @@
 
     // remove intermediate and backup images if there are any
-    foreach ( get_intermediate_image_sizes() as $size ) {
-        if ( $intermediate = image_get_intermediate_size($post_id, $size) ) {
-            $intermediate_file = apply_filters('wp_delete_file', $intermediate['path']);
-            @ unlink( path_join($uploadpath['basedir'], $intermediate_file) );
-        }
+    foreach ( $intermediate_sizes as $intermediate ) {
+        $intermediate_file = apply_filters( 'wp_delete_file', $intermediate['path'] );
+        @ unlink( path_join($uploadpath['basedir'], $intermediate_file) );
     }