Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@11963 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2009-09-23 07:06:58 +00:00
parent 7ee91c9aeb
commit a86aa7b399
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/file.php
View File

@ -265,7 +265,7 @@ function wp_handle_upload( &$file, $overrides = false, $time = null ) {
// A non-empty file will pass this test. // A non-empty file will pass this test.
if ( $test_size && !($file['size'] > 0 ) ) 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. // A properly uploaded file will pass this test. There should be no reason to override this one.
if (! @ is_uploaded_file( $file['tmp_name'] ) ) if (! @ is_uploaded_file( $file['tmp_name'] ) )

5
wp-admin/includes/import.php
View File

@ -59,6 +59,11 @@ function wp_import_cleanup( $id ) {
* @return array * @return array
*/ */
function wp_import_handle_upload() { 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 ); $overrides = array( 'test_form' => false, 'test_type' => false );
$_FILES['import']['name'] .= '.txt'; $_FILES['import']['name'] .= '.txt';
$file = wp_handle_upload( $_FILES['import'], $overrides ); $file = wp_handle_upload( $_FILES['import'], $overrides );