Changeset 30980

Timestamp:

12/20/2014 09:09:11 PM (10 years ago)

Author:

wonderboymusic

Message:

In wp_import_handle_upload():

$file was essentially getting declared/overwritten 3 times. In lieu of this, return an array containing the error immediately instead of doing a short-circuit array key assignment on error. Rename the local variable to $upload and use its properties instead of creating 3 new local vars, one of which stomped the array.

See #30799.

File:

• trunk/src/wp-admin/includes/import.php (modified) (3 diffs)

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

@@ -77 +77 @@
  */
 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 );
-
-    if ( isset( $file['error'] ) )
-        return $file;
-
-    $url = $file['url'];
-    $type = $file['type'];
-    $file = $file['file'];
-    $filename = basename( $file );
+    $upload = wp_handle_upload( $_FILES['import'], $overrides );
+
+    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'
@@ -104 +102 @@
 
     // Save the data
-    $id = wp_insert_attachment( $object, $file );
+    $id = wp_insert_attachment( $object, $upload['file'] );
 
     /*
@@ -112 +110 @@
     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 );
 }