Changeset 38388 for trunk/src/wp-includes/functions.php

Timestamp:

08/26/2016 09:34:36 PM (5 years ago)

Author:

wonderboymusic

Message:

Multisite: move get_current_site() to load.php so that it can be used in more places, instead of importing global $current_site.

See #37699.

File:

• trunk/src/wp-includes/functions.php (modified) (2 diffs)

trunk/src/wp-includes/functions.php

@@ -4276 +4276 @@
  * @since 3.0.0
  *
- * @global object $current_site
- *
  * @param int $site_id Optional. Site ID to test. Defaults to current site.
  * @return bool True if $site_id is the main site of the network, or if not
@@ -4283 +4281 @@
  */
 function is_main_site( $site_id = null ) {
-    // This is the current network's information; 'site' is old terminology.
-    global $current_site;
-
-    if ( ! is_multisite() )
+    if ( ! is_multisite() ) {
         return true;
-
-    if ( ! $site_id )
+    }
+
+    if ( ! $site_id ) {
         $site_id = get_current_blog_id();
-
-    return (int) $site_id === (int) $current_site->blog_id;
+    }
+    return (int) $site_id === (int) get_current_site()->blog_id;
 }