Wordpress 3.5.2

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

diff --git a/wp-admin/includes/class-wp-importer.php b/wp-admin/includes/class-wp-importer.php
index 5a7f0e47a7e8d858768ef5db5c7bbe17d261660d..0268e7e6ee39835349edcf2a21d768a3091818ba 100644 (file)
--- a/wp-admin/includes/class-wp-importer.php
+++ b/wp-admin/includes/class-wp-importer.php
@@ -10,10 +10,6 @@ class WP_Importer {
         */
        function __construct() {}
 
-       function WP_Importer() {
-               $this->__construct();
-       }
-
        /**
         * Returns array with imported permalinks from WordPress database
         *
@@ -130,14 +126,12 @@ class WP_Importer {
                        }
                        if ( empty( $parsed['path'] ) )
                                $parsed['path'] = '/';
-                       if ( !$blog = get_blog_info( $parsed['host'], $parsed['path'] ) ) {
+                       $blog = get_blog_details( array( 'domain' => $parsed['host'], 'path' => $parsed['path'] ) );
+                       if ( !$blog ) {
                                fwrite( STDERR, "Error: Could not find blog\n" );
                                exit();
                        }
                        $blog_id = (int) $blog->blog_id;
-                       // Restore global $current_blog
-                       global $current_blog;
-                       $current_blog = $blog;
                }
 
                if ( function_exists( 'is_multisite' ) ) {
@@ -189,6 +183,7 @@ class WP_Importer {
 
                $headers = array();
                $args = array();
+               $args['reject_unsafe_urls'] = true;
                if ( true === $head )
                        $args['method'] = 'HEAD';
                if ( !empty( $username ) && !empty( $password ) )
@@ -215,8 +210,6 @@ class WP_Importer {
         * @return bool
         */
        function is_user_over_quota() {
-               global $current_user, $current_blog;
-
                if ( function_exists( 'upload_is_user_over_quota' ) ) {
                        if ( upload_is_user_over_quota( 1 ) ) {
                                echo "Sorry, you have used your upload quota.\n";