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
This commit is contained in:
parent
a88704d026
commit
e362e61ae5
|
@ -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' );
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue