From 3ce626a96be11ff7a10d43f1f8a8dbacd5422c46 Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Thu, 17 Oct 2013 18:39:04 +0000 Subject: [PATCH] Silence PHP warnings from disk_free_space(). disk_free_space() will produce a warning in error conditions in addition to returning false, this includes a case where the bytes free is greater than PHP_INT_MAX (which is a error condition we don't need to check). See #25576, #22704 git-svn-id: https://develop.svn.wordpress.org/trunk@25831 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/file.php | 4 ++-- src/wp-admin/includes/update-core.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php index 3f0455caea..182f1d9d00 100644 --- a/src/wp-admin/includes/file.php +++ b/src/wp-admin/includes/file.php @@ -622,7 +622,7 @@ function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) { * A disk that has zero free bytes has bigger problems. * Require we have enough space to unzip the file and copy its contents, with a 10% buffer. */ - $available_space = disk_free_space( WP_CONTENT_DIR ); + $available_space = @disk_free_space( WP_CONTENT_DIR ); if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space ) return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) ); @@ -722,7 +722,7 @@ function _unzip_file_pclzip($file, $to, $needed_dirs = array()) { * A disk that has zero free bytes has bigger problems. * Require we have enough space to unzip the file and copy its contents, with a 10% buffer. */ - $available_space = disk_free_space( WP_CONTENT_DIR ); + $available_space = @disk_free_space( WP_CONTENT_DIR ); if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space ) return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) ); diff --git a/src/wp-admin/includes/update-core.php b/src/wp-admin/includes/update-core.php index 267d8ee157..6acd54c2b0 100644 --- a/src/wp-admin/includes/update-core.php +++ b/src/wp-admin/includes/update-core.php @@ -773,7 +773,7 @@ function update_core($from, $to) { // 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 ); + $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.' ) ); } else {