Ticket #39476: 39476.diff

src/wp-includes/post.php

@@ -4919 +4919 @@
         if ( ! empty($meta['thumb']) ) {
                 // Don't delete the thumb if another attachment uses it.
                 if (! $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attachment_metadata' AND meta_value LIKE %s AND post_id <> %d", '%' . $wpdb->esc_like( $meta['thumb'] ) . '%', $post_id)) ) {
-                        $thumbfile = str_replace(basename($file), $meta['thumb'], $file);
-                        /** This filter is documented in wp-includes/functions.php */
-                        $thumbfile = apply_filters( 'wp_delete_file', $thumbfile );
-                        @ unlink( path_join($uploadpath['basedir'], $thumbfile) );
+                        $thumbfile = str_replace( basename( $file ), $meta['thumb'], $file );
+                        wp_delete_file( path_join( $uploadpath['basedir'], $thumbfile ) );
                 }
         }
 
@@ -4930 +4928 @@
         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-includes/functions.php */
-                        $intermediate_file = apply_filters( 'wp_delete_file', $intermediate_file );
-                        @ unlink( path_join( $uploadpath['basedir'], $intermediate_file ) );
+                        wp_delete_file( path_join( $uploadpath['basedir'], $intermediate_file ) );
                 }
         }
 
@@ -4939 +4935 @@
         if ( is_array($backup_sizes) ) {
                 foreach ( $backup_sizes as $size ) {
                         $del_file = path_join( dirname($meta['file']), $size['file'] );
-                        /** This filter is documented in wp-includes/functions.php */
-                        $del_file = apply_filters( 'wp_delete_file', $del_file );
-                        @ unlink( path_join($uploadpath['basedir'], $del_file) );
+                        wp_delete_file( path_join( $uploadpath['basedir'], $del_file ) );
                 }
         }