Wordpress 2.5.1

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

diff --git a/wp-admin/includes/import.php b/wp-admin/includes/import.php
index 9835bb14d9d209ecc7e354888c909de55514f8a5..35fd141b17d9d6b431e98bae1163c2ddc75e4b5e 100644 (file)
--- a/wp-admin/includes/import.php
+++ b/wp-admin/includes/import.php
@@ -2,7 +2,8 @@
 
 function get_importers() {
        global $wp_importers;
-       uasort($wp_importers, create_function('$a, $b', 'return strcmp($a[0], $b[0]);'));
+       if ( is_array($wp_importers) )
+               uasort($wp_importers, create_function('$a, $b', 'return strcmp($a[0], $b[0]);'));
        return $wp_importers;
 }
 
@@ -19,6 +20,7 @@ function wp_import_cleanup( $id ) {
 
 function wp_import_handle_upload() {
        $overrides = array( 'test_form' => false, 'test_type' => false );
+       $_FILES['import']['name'] .= '.import';
        $file = wp_handle_upload( $_FILES['import'], $overrides );
 
        if ( isset( $file['error'] ) )