WordPress 4.2

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

diff --git a/wp-admin/includes/import.php b/wp-admin/includes/import.php
index ab8e8e3db0815738a2e0d7a2facc3f043dfb422c..55c6e78bb95f099d371c5d5764b363f8b449d9c1 100644 (file)
--- a/wp-admin/includes/import.php
+++ b/wp-admin/includes/import.php
@@ -76,34 +76,32 @@ function wp_import_cleanup( $id ) {
  * @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;
+       if ( ! isset( $_FILES['import'] ) ) {
+               return array(
+                       '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.' )
+               );
        }
 
        $overrides = array( 'test_form' => false, 'test_type' => false );
        $_FILES['import']['name'] .= '.txt';
-       $file = wp_handle_upload( $_FILES['import'], $overrides );
+       $upload = wp_handle_upload( $_FILES['import'], $overrides );
 
-       if ( isset( $file['error'] ) )
-               return $file;
-
-       $url = $file['url'];
-       $type = $file['type'];
-       $file = $file['file'];
-       $filename = basename( $file );
+       if ( isset( $upload['error'] ) ) {
+               return $upload;
+       }
 
        // Construct the object array
-       $object = array( 'post_title' => $filename,
-               'post_content' => $url,
-               'post_mime_type' => $type,
-               'guid' => $url,
+       $object = array(
+               'post_title' => basename( $upload['file'] ),
+               'post_content' => $upload['url'],
+               'post_mime_type' => $upload['type'],
+               'guid' => $upload['url'],
                'context' => 'import',
                'post_status' => 'private'
        );
 
        // Save the data
-       $id = wp_insert_attachment( $object, $file );
+       $id = wp_insert_attachment( $object, $upload['file'] );
 
        /*
         * Schedule a cleanup for one day from now in case of failed
@@ -111,7 +109,7 @@ function wp_import_handle_upload() {
         */
        wp_schedule_single_event( time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array( $id ) );
 
-       return array( 'file' => $file, 'id' => $id );
+       return array( 'file' => $upload['file'], 'id' => $id );
 }
 
 /**