Changeset 25831

Timestamp:

10/17/2013 06:39:04 PM (11 years ago)

Author:

dd32

Message:

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

Location:

trunk/src/wp-admin/includes

Files:

• file.php (modified) (2 diffs)
• update-core.php (modified) (1 diff)

trunk/src/wp-admin/includes/file.php

@@ -623 +623 @@
      * 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' ) );
@@ -723 +723 @@
      * 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' ) );

trunk/src/wp-admin/includes/update-core.php

@@ -774 +774 @@
         // 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.' ) );