Account for the possible failure of disk_free_space() in update_core().

see #22704, #25576.


git-svn-id: https://develop.svn.wordpress.org/trunk@25778 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2013-10-14 21:14:39 +00:00
parent d6a1b681d3
commit 67c80dae13
1 changed files with 4 additions and 2 deletions

View File

@ -740,8 +740,10 @@ function update_core($from, $to) {
foreach ( $failed as $file )
$total_size += filesize( $working_dir_local . '/' . $file );
// If we don't have enough free space, it isn't worth trying again
if ( $total_size >= disk_free_space( ABSPATH ) ) {
// If we don't have enough free space, it isn't worth trying again.
// Unlikely to be hit due to the check in unzip_file().
$available_space = disk_free_space( ABSPATH );
if ( $available_space && $total_size >= $available_space ) {
$result = new WP_Error( 'disk_full', __( 'There is not enough free disk space to complete the update.' ), $to );
} else {
$result = _copy_dir( $from . $distro, $to, $skip );