Changeset 38814 for trunk/src/wp-includes/load.php

Timestamp:

10/19/2016 04:46:14 AM (8 years ago)

Author:

jeremyfelt

Message:

Multisite: Use get_network() and get_current_network_id() for current network data.

get_network() falls back to the current network when called without any arguments. Between this and get_current_network_id(), we can replace almost all instances of the global $current_site and all instances of get_current_site().

This effectively deprecates get_current_site(), something that we'll do in a future ticket.

Props flixos90.
Fixes #37414.

File:

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

trunk/src/wp-includes/load.php

@@ -815 +815 @@
  * @since 4.6.0
  *
- * @global WP_Network $current_site The current network.
- *
  * @return int The ID of the current network.
  */
@@ -824 +822 @@
     }
 
-    $current_site = get_current_site();
-
-    if ( ! isset( $current_site->id ) ) {
+    $current_network = get_network();
+
+    if ( ! isset( $current_network->id ) ) {
         return get_main_network_id();
     }
 
-    return absint( $current_site->id );
+    return absint( $current_network->id );
 }