Ticket #43990: 43990.patch

src/wp-admin/includes/class-file-upload-upgrader.php

@@ -124 +124 @@
                         wp_delete_attachment( $this->id );
 
                 } elseif ( file_exists( $this->package ) ) {
-                        return @unlink( $this->package );
+                        return @wp_delete_file( $this->package );
                 }
 
                 return true;

src/wp-admin/includes/class-wp-upgrader.php

@@ -324 +324 @@
 
                 // Once extracted, delete the package if required.
                 if ( $delete_package ) {
-                        unlink( $package );
+                        wp_delete_file( $package );
                 }
 
                 if ( is_wp_error( $result ) ) {

src/wp-admin/includes/file.php

@@ -610 +610 @@
 
 /**
  * Returns a filename of a Temporary unique file.
- * Please note that the calling function must unlink() this itself.
+ * Please note that the calling function must wp_delete_file() this itself.
  *
  * The filename is based off the passed parameter or defaults to the current unix timestamp,
  * while the directory can either be passed as well, or by leaving it blank, default to a writable temporary directory.
@@ -848 +848 @@
                 if ( 'wp_handle_upload' === $action ) {
                         $move_new_file = @ move_uploaded_file( $file['tmp_name'], $new_file );
                 } else {
-                        // use copy and unlink because rename breaks streams.
+                        // use copy and wp_delete_file because rename breaks streams.
                         $move_new_file = @ copy( $file['tmp_name'], $new_file );
-                        unlink( $file['tmp_name'] );
+                        wp_delete_file( $file['tmp_name'] );
                 }
 
                 if ( false === $move_new_file ) {
@@ -960 +960 @@
 /**
  * Downloads a URL to a local temporary file using the WordPress HTTP API.
  *
- * Please note that the calling function must unlink() the file.
+ * Please note that the calling function must wp_delete_file() the file.
  *
  * @since 2.5.0
  *
@@ -969 +969 @@
  * @return string|WP_Error Filename on success, WP_Error on failure.
  */
 function download_url( $url, $timeout = 300 ) {
-        //WARNING: The file is not automatically deleted, The script must unlink() the file.
+        //WARNING: The file is not automatically deleted, The script must wp_delete_file() the file.
         if ( ! $url ) {
                 return new WP_Error( 'http_no_url', __( 'Invalid URL Provided.' ) );
         }
@@ -990 +990 @@
         );
 
         if ( is_wp_error( $response ) ) {
-                unlink( $tmpfname );
+                wp_delete_file( $tmpfname );
                 return $response;
         }
 
@@ -1018 +1018 @@
                         fclose( $tmpf );
                 }
 
-                unlink( $tmpfname );
+                wp_delete_file( $tmpfname );
                 return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ), $data );
         }
 
@@ -1026 +1026 @@
         if ( $content_md5 ) {
                 $md5_check = verify_file_md5( $tmpfname, $content_md5 );
                 if ( is_wp_error( $md5_check ) ) {
-                        unlink( $tmpfname );
+                        wp_delete_file( $tmpfname );
                         return $md5_check;
                 }
         }
@@ -2158 +2158 @@
         }
 
         // And remove the HTML file.
-        unlink( $html_report_pathname );
+        wp_delete_file( $html_report_pathname );
 
         if ( $error ) {
                 wp_send_json_error( $error );
@@ -2346 +2346 @@
         $export_path = get_post_meta( $request_id, '_export_file_path', true );
         if ( ! empty( $export_path ) ) {
                 delete_post_meta( $request_id, '_export_file_path' );
-                @unlink( $export_path );
+                @wp_delete_file( $export_path );
         }
         delete_post_meta( $request_id, '_export_file_url' );
 

src/wp-includes/class-snoopy.php

@@ -1081 +1081 @@
                 else
                         $this->results = $results;
 
-                unlink("$headerfile");
+                wp_delete_file("$headerfile");
 
                 return true;
         }

src/wp-includes/functions.php

@@ -1896 +1896 @@
         }
         fclose( $f );
         if ( $should_delete_tmp_file ) {
-                unlink( $path );
+                wp_delete_file( $path );
         }
         return true;
 }
@@ -6307 +6307 @@
                 $file_age_in_seconds = time() - filemtime( $export_file );
 
                 if ( $expiration < $file_age_in_seconds ) {
-                        unlink( $export_file );
+                        wp_delete_file( $export_file );
                 }
         }
 }

src/wp-includes/post.php

@@ -5286 +5286 @@
                         $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 ) );
+                        @ wp_delete_file( path_join( $uploadpath['basedir'], $thumbfile ) );
                 }
         }
 
@@ -5296 +5296 @@
                         $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 ) );
                 }
         }
 
@@ -5305 +5305 @@
                         $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 ) );
                 }
         }
 

src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php

@@ -565 +565 @@
                 $sideloaded = wp_handle_sideload( $file_data, $overrides );
 
                 if ( isset( $sideloaded['error'] ) ) {
-                        @unlink( $tmpfname );
+                        @wp_delete_file( $tmpfname );
 
                         return new WP_Error( 'rest_upload_sideload_error', $sideloaded['error'], array( 'status' => 500 ) );
                 }