Changeset 25776 for trunk/src/wp-admin/includes/file.php

Timestamp:

10/14/2013 08:57:28 PM (13 years ago)

Author:

nacin

Message:

Account for possible failures by disk_free_space(), as well as the potential need to copy the unzipped files.

see #25576.

File:

• trunk/src/wp-admin/includes/file.php (modified) (2 diffs)

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

@@ -619 +619 @@
         }
 
+        /*
+         * disk_free_space() could return false. Assume that any falsey value is an error.
+         * 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 );
-        if ( ( $uncompressed_size * 1.2 ) > $available_space )
+        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' ) );
 
@@ -714 +719 @@
         }
 
+        /*
+         * disk_free_space() could return false. Assume that any falsey value is an error.
+         * 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 );
-        if ( ( $uncompressed_size * 1.2 ) > $available_space )
+        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' ) );