Ticket #6142: remove-intermediate-images-r7201.patch

wp-includes/post.php

@@ -2180 +2180 @@
                 }
         }
 
+        // 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);
+                }
+        }
+
         $file = apply_filters('wp_delete_file', $file);
 
         if ( ! empty($file) )

wp-includes/media.php

@@ -79 +79 @@
                 list( $width, $height ) = image_constrain_size_for_editor( $meta['width'], $meta['height'], $size );
         }
 
-        return array( $img_url, $width, $height );
+        if ( $img_url)
+                return array( $img_url, $width, $height );
+        return false;
 
 }
 
@@ -253 +255 @@
         if ( empty($imagedata['sizes'][$size]) )
                 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;
 }
 
 // get an image to represent an attachment - a mime icon for files, thumbnail or intermediate size for images
@@ -290 +299 @@
         return $html;
 }
 
-
 add_shortcode('gallery', 'gallery_shortcode');
 
 function gallery_shortcode($attr) {