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 2b4774bcf34b401b97c5832cb3fc78fbf8a392cb..0268e7e6ee39835349edcf2a21d768a3091818ba 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' ) ) {


@@ -186,6 +183,7 @@ class WP_Importer {
 
                $headers = array();
                $args = array();
 
                $headers = array();
                $args = array();

+               $args['reject_unsafe_urls'] = true;

                if ( true === $head )
                        $args['method'] = 'HEAD';
                if ( !empty( $username ) && !empty( $password ) )
                if ( true === $head )
                        $args['method'] = 'HEAD';
                if ( !empty( $username ) && !empty( $password ) )


@@ -212,8 +210,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";