Changeset 31575 for trunk/src/wp-admin/includes/image-edit.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-admin/includes/image-edit.php (modified) (3 diffs)

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