Ticket #33900: 33900.diff

src/wp-includes/functions.php

@@ -4242 +4242 @@
  *
  * @since 4.3.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
+ * @global wpdb       $wpdb         WordPress database abstraction object.
+ * @global WP_Network $current_site The current network.
  *
  * @return int The ID of the main network.
  */
 function get_main_network_id() {
-        global $wpdb;
+        global $wpdb, $current_site;
 
         if ( ! is_multisite() ) {
                 return 1;
@@ -4255 +4256 @@
 
         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;
         } else {

src/wp-includes/load.php

@@ -808 +808 @@
 }
 
 /**
+ * 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() {
+        global $current_site;
+
+        if ( ! is_multisite() ) {
+                return 1;
+        }
+
+        if ( ! isset( $current_site->id ) ) {
+                return get_main_network_id();
+        }
+
+        return absint( $current_site->id );
+}
+
+/**
  * Attempt an early load of translations.
  *
  * Used for errors encountered during the initial loading process, before