Changeset 11963

Timestamp:

09/23/2009 07:06:58 AM (17 years ago)

Author:

westi

Message:

Handle the file upload case on import when post_max_size is smaller than upload_max_filesize and no POST data arrives at all. Fixes #10830.

Location:

trunk/wp-admin/includes

Files:

• file.php (modified) (1 diff)
• import.php (modified) (1 diff)

trunk/wp-admin/includes/file.php

@@ -266 +266 @@
         // A non-empty file will pass this test.
         if ( $test_size && !($file['size'] > 0 ) )
-                return $upload_error_handler( $file, __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini.' ));
+                return $upload_error_handler( $file, __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' ));
 
         // A properly uploaded file will pass this test. There should be no reason to override this one.

trunk/wp-admin/includes/import.php

@@ -60 +60 @@
  */
 function wp_import_handle_upload() {
+        if ( !isset($_FILES['import']) ) {
+                $file['error'] = __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' );  
+                return $file;
+        }
+        
         $overrides = array( 'test_form' => false, 'test_type' => false );
         $_FILES['import']['name'] .= '.txt';