Changeset 37670

Timestamp:

06/09/2016 08:33:35 PM (8 years ago)

Author:

jeremyfelt

Message:

Multisite: Introduce get_current_network_id()

Similar to get_current_blog_id, this can be used to get the ID of the $current_site global. If not available, it will fallback to the main network ID. In single site, this will return 1.

Props spacedmonkey, flixos90.
Fixes #33900.

Location:

trunk/src/wp-includes

Files:

• functions.php (modified) (1 diff)
• load.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -4256 +4256 @@
     }
 
+    $current_site = get_current_site();
+
     if ( defined( 'PRIMARY_NETWORK_ID' ) ) {
         $main_network_id = PRIMARY_NETWORK_ID;
-    } elseif ( 1 === (int) get_current_site()->id ) {
+    } elseif ( isset( $current_site->id ) && 1 === (int) $current_site->id ) {
         // If the current network has an ID of 1, assume it is the main network.
         $main_network_id = 1;

trunk/src/wp-includes/load.php

@@ -809 +809 @@
 
 /**
+ * Retrieves the current network ID.
+ *
+ * @since 4.6.0
+ *
+ * @global WP_Network $current_site The current network.
+ *
+ * @return int The ID of the current network.
+ */
+function get_current_network_id() {
+    if ( ! is_multisite() ) {
+        return 1;
+    }
+
+    $current_site = get_current_site();
+
+    if ( ! isset( $current_site->id ) ) {
+        return get_main_network_id();
+    }
+
+    return absint( $current_site->id );
+}
+
+/**
  * Attempt an early load of translations.
  *