Changeset 41875

Timestamp:

10/16/2017 05:05:25 PM (7 years ago)

Author:

jeremyfelt

Message:

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.

File:

• trunk/src/wp-includes/ms-settings.php (modified) (1 diff)

trunk/src/wp-includes/ms-settings.php

@@ -19 +19 @@
  * @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 */