Changeset 7271

Timestamp:

03/12/2008 11:15:31 PM (19 years ago)

Author:

ryan

Message:

Remove intermediate images when deleting an attachment. Props tellyworth. fixes #6142

Location:

trunk/wp-includes

Files:

• media.php (modified) (3 diffs)
• post.php (modified) (1 diff)

trunk/wp-includes/media.php

@@ -85 +85 @@
         }
 
-        return array( $img_url, $width, $height );
+        if ( $img_url)
+                return array( $img_url, $width, $height );
+        return false;
 
 }
@@ -285 +287 @@
                 return false;
                 
-        return $imagedata['sizes'][$size];
+        $data = $imagedata['sizes'][$size];
+        // include the full filesystem path of the intermediate file
+        if ( empty($data['path']) && !empty($data['file']) ) {
+                $file_url = wp_get_attachment_url($post_id);
+                $data['path'] = path_join( dirname($imagedata['file']), $data['file'] );
+                $data['url'] = path_join( dirname($file_url), $data['file'] );
+        }
+        return $data;
 }
 
@@ -321 +330 @@
         return $html;
 }
-
 
 add_shortcode('gallery', 'gallery_shortcode');

trunk/wp-includes/post.php

@@ -2178 +2178 @@
                         $thumbfile = apply_filters('wp_delete_file', $thumbfile);
                         @ unlink($thumbfile);
+                }
+        }
+
+        // remove intermediate images if there are any
+        $sizes = apply_filters('intermediate_image_sizes', array('thumbnail', 'medium'));
+        foreach ( $sizes as $size ) {
+                if ( $intermediate = image_get_intermediate_size($postid, $size) ) {
+                        $intermediate_file = apply_filters('wp_delete_file', $intermediate['path']);
+                        @ unlink($intermediate_file);
                 }
         }