X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/41578db67d72562346e4dbb2a14889b23d522813..5e031ad59895b5682d1509675cafe9f2c5081c12:/wp-admin/includes/import.php

diff --git a/wp-admin/includes/import.php b/wp-admin/includes/import.php
index f01eb873..55c6e78b 100644
--- a/wp-admin/includes/import.php
+++ b/wp-admin/includes/import.php
@@ -76,39 +76,40 @@ 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 import or missing wp_import_cleanup() call
+	/*
+	 * Schedule a cleanup for one day from now in case of failed
+	 * import or missing wp_import_cleanup() call.
+	 */
 	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 );
 }
 
 /**
@@ -119,7 +120,7 @@ function wp_import_handle_upload() {
  * @return array Importers with metadata for each.
  */
 function wp_get_popular_importers() {
-	include ABSPATH . WPINC . '/version.php'; // include an unmodified $wp_version
+	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
 
 	$locale = get_locale();
 	$popular_importers = get_site_transient( 'popular_importers_' . $locale );