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 35fd141b17d9d6b431e98bae1163c2ddc75e4b5e..51861bdcdbecac80f2346d47e0f7ceaa0bc3177d 100644 (file)
--- a/wp-admin/includes/import.php
+++ b/wp-admin/includes/import.php
@@ -1,5 +1,18 @@
 <?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) )
@@ -7,6 +20,17 @@ function get_importers() {
        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 ) )
@@ -14,13 +38,34 @@ function register_importer( $id, $name, $description, $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 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'] ) )
@@ -28,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