Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Multisite: Replace get_blog_details() in WP_Importer::set_blog() with get_site().

Browse Source 
Props spacedmonkey, iamfriendly.
See #37102.
Fixes #38345.

Built from https://develop.svn.wordpress.org/trunk@38820


git-svn-id: http://core.svn.wordpress.org/trunk@38763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt 2016-10-19 05:45:31 +00:00
parent 4d44eeadd6
commit be6e98426b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/includes/class-wp-importer.php
View File

@ -136,13 +136,15 @@ class WP_Importer {
fwrite( STDERR, "Error: can not determine blog_id from $blog_id\n" ); fwrite( STDERR, "Error: can not determine blog_id from $blog_id\n" );
exit(); exit();
} }
if ( empty( $parsed['path'] ) ) if ( empty( $parsed['path'] ) ) {
$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" ); fwrite( STDERR, "Error: Could not find blog\n" );
exit(); exit();
} }
$blog = array_shift( $blogs );
$blog_id = (int) $blog->blog_id; $blog_id = (int) $blog->blog_id;
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.