Ticket #33900: 33900.3.patch

src/wp-includes/functions.php

@@ -4220 +4220 @@
  *
  * @since 4.3.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
+ * @global wpdb   $wpdb WordPress database abstraction object.
+ * @global object $current_site
  *
  * @return int The ID of the main network.
  */
 function get_main_network_id() {
-        global $wpdb;
+        global $wpdb, $current_site;
 
         if ( ! is_multisite() ) {
                 return 1;
@@ -4233 +4234 @@
 
         if ( defined( 'PRIMARY_NETWORK_ID' ) ) {
                 $main_network_id = PRIMARY_NETWORK_ID;
-        } elseif ( 1 === (int) get_current_site()->id ) {
+        } elseif ( $current_site instanceof WP_Network && 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

@@ -183 +183 @@
         // If the $upgrading timestamp is older than 10 minutes, don't die.
         if ( ( time() - $upgrading ) >= 600 )
                 return;
-        
+
         /**
          * Bypass the maintenance mode check
          *
          * This filter should *NOT* be used by plugins. It is designed for non-web
-         * runtimes. If this filter returns true, maintenance mode will not be  
+         * runtimes. If this filter returns true, maintenance mode will not be
          * active which can cause problems during updates for web site views.
          *
          * @since 4.6.0
@@ -196 +196 @@
          * @param bool True to bypass maintenance
          */
         if ( apply_filters( 'bypass_maintenance_mode', false ) ){
-                return; 
+                return;
         }
 
         if ( file_exists( WP_CONTENT_DIR . '/maintenance.php' ) ) {
@@ -310 +310 @@
          *
          * @since 4.6.0
          *
-         * @param bool True to bypass debug mode 
+         * @param bool True to bypass debug mode
          */
         if ( apply_filters( 'bypass_debug_mode', false ) ){
-                return; 
+                return;
         }
 
         if ( WP_DEBUG ) {
@@ -808 +808 @@
 }
 
 /**
+ * Retrieve the current network ID.
+ *
+ * @since 4.6.0
+ *
+ * @global object $current_site
+ *
+ * @return int Network id
+ */
+function get_current_network_id() {
+        global $current_site;
+
+        if ( ! is_multisite() ) {
+                return 1;
+        }
+
+        if ( ! $current_site instanceof WP_Network ) {
+                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