Changes from trunk/wp-admin/includes/class-wp-importer.php at r14760 to branches/3.0/wp-admin/includes/class-wp-importer.php at r15452

File:

• branches/3.0/wp-admin/includes/class-wp-importer.php (modified) (2 diffs)

branches/3.0/wp-admin/includes/class-wp-importer.php

@@ -131 +131 @@
             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();
@@ -216 +217 @@
      */
     function is_user_over_quota() {
-        global $current_user, $current_blog;
+        global $current_blog;
 
         if ( function_exists( 'upload_is_user_over_quota' ) ) {