From 555466ab82ac36ebb8d57f2b360e4394463a2dbc Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Wed, 26 Oct 2016 03:39:29 +0000
Subject: [PATCH] Multisite: Replace `get_blog_details()` in inline
 documentation.

Some documentation is now out of date and some can be replaced with a mention of `get_site()`.

Fixes #37102.

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


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

diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php
index 4e2a255663..db3e4639c1 100644
--- a/wp-includes/ms-blogs.php
+++ b/wp-includes/ms-blogs.php
@@ -443,7 +443,7 @@ function update_blog_details( $blog_id, $details = array() ) {
  *
  * @since 3.5.0
  *
- * @param WP_Site $blog The blog details as returned from get_blog_details()
+ * @param WP_Site $blog The site object to be cleared from cache.
  */
 function clean_blog_cache( $blog ) {
 	$blog_id = $blog->blog_id;
diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php
index 568e8d1cdc..cd35f55c63 100644
--- a/wp-includes/ms-deprecated.php
+++ b/wp-includes/ms-deprecated.php
@@ -19,9 +19,9 @@
  *
  * @since MU
  * @deprecated 3.1.0 Use get_site()
- * @see get_blog_details()
+ * @see get_site()
  *
- * @return int Current site ID.
+ * @return WP_Site Current site object.
  */
 function get_dashboard_blog() {
     _deprecated_function( __FUNCTION__, '3.1.0' );
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 5e32a86a04..c65c9d5753 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -1762,8 +1762,8 @@ function check_upload_mimes( $mimes ) {
  *
  * WordPress MS stores a blog's post count as an option so as
  * to avoid extraneous COUNTs when a blog's details are fetched
- * with get_blog_details(). This function is called when posts
- * are published or unpublished to make sure the count stays current.
+ * with get_site(). This function is called when posts are published
+ * or unpublished to make sure the count stays current.
  *
  * @since MU
  *
diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php
index 302a2bccb5..cf564990cc 100644
--- a/wp-includes/ms-load.php
+++ b/wp-includes/ms-load.php
@@ -211,7 +211,7 @@ function get_site_by_path( $domain, $path, $segments = null ) {
 
 	/*
 	 * @todo
-	 * get_blog_details(), caching, etc. Consider alternative optimization routes,
+	 * caching, etc. Consider alternative optimization routes,
 	 * perhaps as an opt-in for plugins, rather than using the pre_* filter.
 	 * For example: The segments filter can expand or ignore paths.
 	 * If persistent caching is enabled, we could query the DB for a path <> '/'
@@ -243,7 +243,6 @@ function get_site_by_path( $domain, $path, $segments = null ) {
 	$site = array_shift( $result );
 
 	if ( $site ) {
-		// @todo get_blog_details()
 		return $site;
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e3b07b7696..d67ecd238a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38942';
+$wp_version = '4.7-alpha-38943';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.