From 0bfa2d746802e12f7dfa91062baa8bfce29d999a Mon Sep 17 00:00:00 2001 From: Jeremy Felt Date: Mon, 16 Oct 2017 17:05:25 +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. git-svn-id: https://develop.svn.wordpress.org/trunk@41875 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/ms-settings.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/wp-includes/ms-settings.php b/src/wp-includes/ms-settings.php index 1afa77adc4..2e4c3a4205 100644 --- a/src/wp-includes/ms-settings.php +++ b/src/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' );