Multisite: Make `$current_site` and `$current_blog` explicitly global.

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

wp-includes/ms-settings.php

@@ -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' );
 

wp-includes/version.php

@@ -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.