Changeset 31575 for trunk/src/wp-includes/post.php

Timestamp:

02/27/2015 04:50:14 PM (10 years ago)

Author:

wonderboymusic

Message:

Make a new function, wp_delete_file(). Use it.

Props scribu, wonderboymusic.
Fixes #17864.

File:

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

trunk/src/wp-includes/post.php

@@ -4848 +4848 @@
         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-admin/custom-header.php */
+            /** This filter is documented in wp-includes/functions.php */
             $thumbfile = apply_filters( 'wp_delete_file', $thumbfile );
             @ unlink( path_join($uploadpath['basedir'], $thumbfile) );
@@ -4858 +4858 @@
         foreach ( $meta['sizes'] as $size => $sizeinfo ) {
             $intermediate_file = str_replace( basename( $file ), $sizeinfo['file'], $file );
-            /** This filter is documented in wp-admin/custom-header.php */
+            /** 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 ) );
@@ -4867 +4867 @@
         foreach ( $backup_sizes as $size ) {
             $del_file = path_join( dirname($meta['file']), $size['file'] );
-            /** This filter is documented in wp-admin/custom-header.php */
+            /** 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) );
@@ -4873 +4873 @@
     }
 
-    /** This filter is documented in wp-admin/custom-header.php */
-    $file = apply_filters( 'wp_delete_file', $file );
-
-    if ( ! empty($file) )
-        @ unlink($file);
+    wp_delete_file( $file );
 
     clean_post_cache( $post );