WordPress 3.8.3

[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 2b4774bcf34b401b97c5832cb3fc78fbf8a392cb..57ff7f4b93b0919828f5998e092b10efbacf9d5a 100644 (file)
--- a/wp-admin/includes/class-wp-importer.php
+++ b/wp-admin/includes/class-wp-importer.php
@@ -132,9 +132,6 @@ class WP_Importer {
                                exit();
                        }
                        $blog_id = (int) $blog->blog_id;
                                exit();
                        }
                        $blog_id = (int) $blog->blog_id;

-                       // Restore global $current_blog
-                       global $current_blog;
-                       $current_blog = $blog;

                }
 
                if ( function_exists( 'is_multisite' ) ) {
                }
 
                if ( function_exists( 'is_multisite' ) ) {


@@ -182,7 +179,7 @@ class WP_Importer {
         */
        function get_page( $url, $username = '', $password = '', $head = false ) {
                // Increase the timeout
         */
        function get_page( $url, $username = '', $password = '', $head = false ) {
                // Increase the timeout

-               add_filter( 'http_request_timeout', array( &$this, 'bump_request_timeout' ) );
+               add_filter( 'http_request_timeout', array( $this, 'bump_request_timeout' ) );

 
                $headers = array();
                $args = array();
 
                $headers = array();
                $args = array();


@@ -193,7 +190,7 @@ class WP_Importer {
 
                $args['headers'] = $headers;
 
 
                $args['headers'] = $headers;
 

-               return wp_remote_request( $url, $args );
+               return wp_safe_remote_request( $url, $args );

        }
 
        /**
        }
 
        /**


@@ -212,8 +209,6 @@ class WP_Importer {
         * @return bool
         */
        function is_user_over_quota() {
         * @return bool
         */
        function is_user_over_quota() {

-               global $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";
                if ( function_exists( 'upload_is_user_over_quota' ) ) {
                        if ( upload_is_user_over_quota( 1 ) ) {
                                echo "Sorry, you have used your upload quota.\n";