Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Multisite: Make $current_site and $current_blog explicitly global.

Browse Source 
See #34941.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37192 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt 2016-04-17 05:12:26 +00:00
parent 54cf1d2c3d
commit 698ca25fb9
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/ms-settings.php
View File

@ -10,6 +10,18 @@
* @since 3.0.0
*/
/**
* Objects representing the current network and current site.
*
* These may be populated through a custom `sunrise.php`. If not, then this
* file will attempt to populate them based on the current request.
*
* @global WP_Network $current_site The current network.
* @global object $current_blog The current site.
* @since 3.0.0
*/
global $current_site, $current_blog;
/** WP_Network class */
require_once( ABSPATH . WPINC . '/class-wp-network.php' );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.6-alpha-37225';
$wp_version = '4.6-alpha-37226';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.