From b45adc74df77ad33da2d819edf8f385033ba1cbb Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Mon, 8 Aug 2016 22:33:28 +0000
Subject: [PATCH] Multisite: Use `get_current_blog_id()` in `get_site()` for
 current site.

The global `$current_blog` is not switched in `switch_to_blog()` and can
not be used to properly retrieve current switched site information.

See #37607.

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


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

diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php
index d1e9aa00e6..ddd21e4097 100644
--- a/wp-includes/ms-blogs.php
+++ b/wp-includes/ms-blogs.php
@@ -478,15 +478,12 @@ function clean_blog_cache( $blog ) {
  *
  * @since 4.6.0
  *
- * @global WP_Site $current_blog The current site.
- *
  * @param WP_Site|int|null $site Optional. Site to retrieve. Default is the current site.
  * @return WP_Site|null The site object or null if not found.
  */
 function get_site( &$site = null ) {
-	global $current_blog;
-	if ( empty( $site ) && isset( $current_blog ) ) {
-		$site = $current_blog;
+	if ( empty( $site ) ) {
+		$site = get_current_blog_id();
 	}
 
 	if ( $site instanceof WP_Site ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 078572f491..eab17746b2 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38216';
+$wp_version = '4.7-alpha-38217';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.