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

Timestamp:

09/20/2016 09:38:08 PM (9 years ago)

Author:

jeremyfelt

Message:

Multisite: Revert [38388].

Restore get_current_site() to a multisite only function. Providing this in single site may be a possibility in the future, but should have a dedicated ticket and discussion.

See #37699.

File:

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

trunk/src/wp-includes/functions.php

@@ -4310 +4310 @@
  * @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
@@ -4315 +4317 @@
  */
 function is_main_site( $site_id = null ) {
-    if ( ! is_multisite() ) {
+    // This is the current network's information; 'site' is old terminology.
+    global $current_site;
+
+    if ( ! is_multisite() )
         return true;
-    }
-
-    if ( ! $site_id ) {
+
+    if ( ! $site_id )
         $site_id = get_current_blog_id();
-    }
-    return (int) $site_id === (int) get_current_site()->blog_id;
+
+    return (int) $site_id === (int) $current_site->blog_id;
 }