WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade: When deleting old files, if deletion fails attempt to empty the file instead. 

Props joemcgill, dd32.
Merges [42434] to the 4.6 branch.
Fixes #42963 for 4.6.

Built from https://develop.svn.wordpress.org/branches/4.6@42468


git-svn-id: http://core.svn.wordpress.org/branches/4.6@42297 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2018-01-16 06:55:34 +00:00
parent 8b0e75a650
commit cf61ff994d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/includes/update-core.php
View File

@ -1081,7 +1081,11 @@ function update_core($from, $to) {
$old_file = $to . $old_file; $old_file = $to . $old_file;
if ( !$wp_filesystem->exists($old_file) ) if ( !$wp_filesystem->exists($old_file) )
continue; continue;
$wp_filesystem->delete($old_file, true);
// If the file isn't deleted, try writing an empty string to the file instead.
if ( ! $wp_filesystem->delete( $old_file, true ) && $wp_filesystem->is_file( $old_file ) ) {
$wp_filesystem->put_contents( $old_file, '' );
}
} }
// Remove any Genericons example.html's from the filesystem // Remove any Genericons example.html's from the filesystem