Changeset 9846

Timestamp:

11/22/2008 11:01:28 PM (16 years ago)

Author:

westi

Message:

Ensure that thumbnails are removed when the media file is deleted. Fixes #8309 props jacobsantos.

File:

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

trunk/wp-includes/post.php

@@ -22 +22 @@
  * @uses apply_filters() Calls 'get_attached_file' on file path and attachment ID.
  *
- * @param int $attachment_id Attachment ID
- * @param bool $unfiltered Whether to apply filters or not
+ * @param int $attachment_id Attachment ID.
+ * @param bool $unfiltered Whether to apply filters or not.
  * @return string The file path to the attached file.
  */
@@ -2419 +2419 @@
     $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE post_id = %d ", $postid ));
 
+    $uploadPath = wp_upload_dir();
+
     if ( ! empty($meta['thumb']) ) {
         // Don't delete the thumb if another attachment uses it
@@ -2424 +2426 @@
             $thumbfile = str_replace(basename($file), $meta['thumb'], $file);
             $thumbfile = apply_filters('wp_delete_file', $thumbfile);
-            @ unlink($thumbfile);
+            @ unlink( path_join($uploadPath['basedir'], $thumbfile) );
         }
     }
@@ -2433 +2435 @@
         if ( $intermediate = image_get_intermediate_size($postid, $size) ) {
             $intermediate_file = apply_filters('wp_delete_file', $intermediate['path']);
-            @ unlink($intermediate_file);
+            @ unlink( path_join($uploadPath['basedir'], $intermediate_file) );
         }
     }