Changeset 31575

Timestamp:

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

Author:

wonderboymusic

Message:

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

Props scribu, wonderboymusic.
Fixes #17864.

Location:

trunk/src

Files:

• wp-admin/custom-header.php (modified) (1 diff)
• wp-admin/includes/image-edit.php (modified) (3 diffs)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/post.php (modified) (4 diffs)

trunk/src/wp-admin/custom-header.php

@@ -883 +883 @@
                 $medium = str_replace( basename( $original ), 'midsize-' . basename( $original ), $original );
                 if ( file_exists( $medium ) ) {
-                        /**
-                         * Filter the path of the file to delete.
-                         *
-                         * @since 2.1.0
-                         *
-                         * @param string $medium Path to the file to delete.
-                         */
-                        @unlink( apply_filters( 'wp_delete_file', $medium ) );
+                        wp_delete_file( $medium );
                 }
 
                 if ( empty( $_POST['create-new-attachment'] ) && empty( $_POST['skip-cropping'] ) ) {
-                        /** This filter is documented in wp-admin/custom-header.php */
-                        @unlink( apply_filters( 'wp_delete_file', $original ) );
+                        wp_delete_file( $original );
                 }
 

trunk/src/wp-admin/includes/image-edit.php

@@ -617 +617 @@
                                 // Delete only if it's edited image.
                                 if ( preg_match('/-e[0-9]{13}\./', $parts['basename']) ) {
-
-                                        /** This filter is documented in wp-admin/custom-header.php */
-                                        $delpath = apply_filters( 'wp_delete_file', $file );
-                                        @unlink($delpath);
+                                        wp_delete_file( $file );
                                 }
                         } elseif ( isset( $meta['width'], $meta['height'] ) ) {
@@ -643 +640 @@
                                         // Delete only if it's edited image
                                         if ( preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file']) ) {
-                                                /** This filter is documented in wp-admin/custom-header.php */
-                                                $delpath = apply_filters( 'wp_delete_file', path_join($parts['dirname'], $meta['sizes'][$default_size]['file']) );
-                                                @unlink($delpath);
+                                                $delete_file = path_join( $parts['dirname'], $meta['sizes'][$default_size]['file'] );
+                                                wp_delete_file( $delete_file );
                                         }
                                 } else {
@@ -858 +854 @@
 
         if ( $delete ) {
-
-                /** This filter is documented in wp-admin/custom-header.php */
-                $delpath = apply_filters( 'wp_delete_file', $new_path );
-                @unlink( $delpath );
+                wp_delete_file( $new_path );
         }
 

trunk/src/wp-includes/functions.php

@@ -4814 +4814 @@
         return (bool) $var;
 }
+
+/**
+ * Delete a file
+ *
+ * @since 4.2.0
+ *
+ * @param string $file The path to the file to delete.
+ */
+function wp_delete_file( $file ) {
+        /**
+         * Filter the path of the file to delete.
+         *
+         * @since 2.1.0
+         *
+         * @param string $medium Path to the file to delete.
+         */
+        $delete = apply_filters( 'wp_delete_file', $file );
+        if ( ! empty( $delete ) ) {
+                @unlink( $delete );
+        }
+}

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 );