diff --git a/wp-admin/includes/class-wp-importer.php b/wp-admin/includes/class-wp-importer.php index 408fe1bc04..794fa5cf0d 100644 --- a/wp-admin/includes/class-wp-importer.php +++ b/wp-admin/includes/class-wp-importer.php @@ -136,13 +136,15 @@ class WP_Importer { fwrite( STDERR, "Error: can not determine blog_id from $blog_id\n" ); exit(); } - if ( empty( $parsed['path'] ) ) + if ( empty( $parsed['path'] ) ) { $parsed['path'] = '/'; - $blog = get_blog_details( array( 'domain' => $parsed['host'], 'path' => $parsed['path'] ) ); - if ( !$blog ) { + } + $blogs = get_sites( array( 'domain' => $parsed['host'], 'number' => 1, 'path' => $parsed['path'] ) ); + if ( ! $blogs ) { fwrite( STDERR, "Error: Could not find blog\n" ); exit(); } + $blog = array_shift( $blogs ); $blog_id = (int) $blog->blog_id; } diff --git a/wp-includes/version.php b/wp-includes/version.php index 215a22a715..5dd1875b42 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38819'; +$wp_version = '4.7-alpha-38820'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.