diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 3c1911a537..5e32a86a04 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -53,9 +53,9 @@ function get_active_blog_for_user( $user_id ) { if ( false !== $primary_blog ) { if ( ! isset( $blogs[ $primary_blog ] ) ) { update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id ); - $primary = get_blog_details( $first_blog->userblog_id ); + $primary = get_site( $first_blog->userblog_id ); } else { - $primary = get_blog_details( $primary_blog ); + $primary = get_site( $primary_blog ); } } else { //TODO Review this call to add_user_to_blog too - to get here the user must have a role on this blog? @@ -71,7 +71,7 @@ function get_active_blog_for_user( $user_id ) { foreach ( (array) $blogs as $blog_id => $blog ) { if ( $blog->site_id != $wpdb->siteid ) continue; - $details = get_blog_details( $blog_id ); + $details = get_site( $blog_id ); if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) { $ret = $blog; if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id ) diff --git a/wp-includes/version.php b/wp-includes/version.php index 107ff012fa..3ddd62caa1 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38913'; +$wp_version = '4.7-alpha-38914'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.