diff -r a4642baaf829 -r 4d4862461b8d web/wp-admin/includes/import.php
--- a/web/wp-admin/includes/import.php	Tue Feb 02 14:45:47 2010 +0000
+++ b/web/wp-admin/includes/import.php	Tue Feb 02 15:44:16 2010 +0000
@@ -1,87 +1,92 @@
-<?php
-/**
- * WordPress Administration Importer API.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/**
- * Retrieve list of importers.
- *
- * @since 2.0.0
- *
- * @return array
- */
-function get_importers() {
-	global $wp_importers;
-	if ( is_array($wp_importers) )
-		uasort($wp_importers, create_function('$a, $b', 'return strcmp($a[0], $b[0]);'));
-	return $wp_importers;
-}
-
-/**
- * Register importer for WordPress.
- *
- * @since 2.0.0
- *
- * @param string $id Importer tag. Used to uniquely identify importer.
- * @param string $name Importer name and title.
- * @param string $description Importer description.
- * @param callback $callback Callback to run.
- * @return WP_Error Returns WP_Error when $callback is WP_Error.
- */
-function register_importer( $id, $name, $description, $callback ) {
-	global $wp_importers;
-	if ( is_wp_error( $callback ) )
-		return $callback;
-	$wp_importers[$id] = array ( $name, $description, $callback );
-}
-
-/**
- * Cleanup importer.
- *
- * Removes attachment based on ID.
- *
- * @since 2.0.0
- *
- * @param string $id Importer ID.
- */
-function wp_import_cleanup( $id ) {
-	wp_delete_attachment( $id );
-}
-
-/**
- * Handle importer uploading and add attachment.
- *
- * @since 2.0.0
- *
- * @return array
- */
-function wp_import_handle_upload() {
-	$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 = addslashes( $file['file'] );
-	$filename = basename( $file );
-
-	// Construct the object array
-	$object = array( 'post_title' => $filename,
-		'post_content' => $url,
-		'post_mime_type' => $type,
-		'guid' => $url
-	);
-
-	// Save the data
-	$id = wp_insert_attachment( $object, $file );
-
-	return array( 'file' => $file, 'id' => $id );
-}
-
-?>
+<?php
+/**
+ * WordPress Administration Importer API.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/**
+ * Retrieve list of importers.
+ *
+ * @since 2.0.0
+ *
+ * @return array
+ */
+function get_importers() {
+	global $wp_importers;
+	if ( is_array($wp_importers) )
+		uasort($wp_importers, create_function('$a, $b', 'return strcmp($a[0], $b[0]);'));
+	return $wp_importers;
+}
+
+/**
+ * Register importer for WordPress.
+ *
+ * @since 2.0.0
+ *
+ * @param string $id Importer tag. Used to uniquely identify importer.
+ * @param string $name Importer name and title.
+ * @param string $description Importer description.
+ * @param callback $callback Callback to run.
+ * @return WP_Error Returns WP_Error when $callback is WP_Error.
+ */
+function register_importer( $id, $name, $description, $callback ) {
+	global $wp_importers;
+	if ( is_wp_error( $callback ) )
+		return $callback;
+	$wp_importers[$id] = array ( $name, $description, $callback );
+}
+
+/**
+ * Cleanup importer.
+ *
+ * Removes attachment based on ID.
+ *
+ * @since 2.0.0
+ *
+ * @param string $id Importer ID.
+ */
+function wp_import_cleanup( $id ) {
+	wp_delete_attachment( $id );
+}
+
+/**
+ * Handle importer uploading and add attachment.
+ *
+ * @since 2.0.0
+ *
+ * @return array
+ */
+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'] .= '.txt';
+	$file = wp_handle_upload( $_FILES['import'], $overrides );
+
+	if ( isset( $file['error'] ) )
+		return $file;
+
+	$url = $file['url'];
+	$type = $file['type'];
+	$file = addslashes( $file['file'] );
+	$filename = basename( $file );
+
+	// Construct the object array
+	$object = array( 'post_title' => $filename,
+		'post_content' => $url,
+		'post_mime_type' => $type,
+		'guid' => $url
+	);
+
+	// Save the data
+	$id = wp_insert_attachment( $object, $file );
+
+	return array( 'file' => $file, 'id' => $id );
+}
+
+?>