Wordpress 3.1.1

[autoinstalls/wordpress.git] / wp-admin / includes / import.php

diff --git a/wp-admin/includes/import.php b/wp-admin/includes/import.php
index c9cd71cb580920b44d9ad39bd14a529125ada973..51861bdcdbecac80f2346d47e0f7ceaa0bc3177d 100644 (file)
--- a/wp-admin/includes/import.php
+++ b/wp-admin/includes/import.php
@@ -56,11 +56,16 @@ function wp_import_cleanup( $id ) {
  *
  * @since 2.0.0
  *
- * @return array
+ * @return array Uploaded file's details on success, error message on failure
  */
 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'] .= '.import';
+       $_FILES['import']['name'] .= '.txt';
        $file = wp_handle_upload( $_FILES['import'], $overrides );
 
        if ( isset( $file['error'] ) )
@@ -68,7 +73,7 @@ function wp_import_handle_upload() {
 
        $url = $file['url'];
        $type = $file['type'];
-       $file = addslashes( $file['file'] );
+       $file = $file['file'];
        $filename = basename( $file );
 
        // Construct the object array