From e362e61ae5bf1f4717b29d51d631a763e680dc4f Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Mon, 16 Oct 2017 17:06:48 +0000
Subject: [PATCH] Multisite: Explicitly globalize global variables in
 `ms-settings.php`.

Explicitly globalize and document `$domain`, `$path`, `$site_id`, and `$public` in `ms-settings.php.

Props csloisel, danielbachhuber.
Fixes #39419.

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


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

diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php
index 1afa77adc4..2e4c3a4205 100644
--- a/wp-includes/ms-settings.php
+++ b/wp-includes/ms-settings.php
@@ -18,9 +18,18 @@
  *
  * @global WP_Network $current_site The current network.
  * @global object     $current_blog The current site.
+ * @global string     $domain       Deprecated. The domain of the site found on load.
+ *                                  Use `get_site()->domain` instead.
+ * @global string     $path         Deprecated. The path of the site found on load.
+ *                                  Use `get_site()->path` instead.
+ * @global int        $site_id      Deprecated. The ID of the network found on load.
+ *                                  Use `get_current_network_id()` instead.
+ * @global bool       $public       Deprecated. Whether the site found on load is public.
+ *                                  Use `get_site()->public` instead.
+ *
  * @since 3.0.0
  */
-global $current_site, $current_blog;
+global $current_site, $current_blog, $domain, $path, $site_id, $public;
 
 /** WP_Network class */
 require_once( ABSPATH . WPINC . '/class-wp-network.php' );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2930e65f4f..893cd7ef71 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-beta2-41874';
+$wp_version = '4.9-beta2-41875';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.