From 680f14fcd110bd7f3fc2b355b181725bbbaab78e Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Tue, 25 Oct 2016 18:50:30 +0000
Subject: [PATCH] Multisite: Replace `get_blog_details()` in
 `wp-includes/ms-blogs.php` with `get_site()`.

Props flixos90.
See #37102.
Fixes #38351.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38858 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/ms-blogs.php | 8 ++++----
 wp-includes/version.php  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php
index b399cfaf9c..46a3961c8f 100644
--- a/wp-includes/ms-blogs.php
+++ b/wp-includes/ms-blogs.php
@@ -38,7 +38,7 @@ function wpmu_update_blogs_date() {
  * @return string Full URL of the blog if found. Empty string if not.
  */
 function get_blogaddress_by_id( $blog_id ) {
-	$bloginfo = get_blog_details( (int) $blog_id );
+	$bloginfo = get_site( (int) $blog_id );
 
 	if ( empty( $bloginfo ) ) {
 		return '';
@@ -266,7 +266,7 @@ function refresh_blog_details( $blog_id = 0 ) {
 		$blog_id = get_current_blog_id();
 	}
 
-	$details = get_blog_details( $blog_id, false );
+	$details = get_site( $blog_id );
 	if ( ! $details ) {
 		// Make sure clean_blog_cache() gets the blog ID
 		// when the blog has been previously cached as
@@ -310,7 +310,7 @@ function update_blog_details( $blog_id, $details = array() ) {
 	if ( is_object($details) )
 		$details = get_object_vars($details);
 
-	$current_details = get_blog_details($blog_id, false);
+	$current_details = get_site( $blog_id );
 	if ( empty($current_details) )
 		return false;
 
@@ -1038,7 +1038,7 @@ function update_blog_status( $blog_id, $pref, $value, $deprecated = null ) {
 function get_blog_status( $id, $pref ) {
 	global $wpdb;
 
-	$details = get_blog_details( $id, false );
+	$details = get_site( $id );
 	if ( $details )
 		return $details->$pref;
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3ddd62caa1..30ac1bd612 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38914';
+$wp_version = '4.7-alpha-38915';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.