Ticket #29684: 29684.diff

src/wp-includes/ms-load.php

@@ -456 +456 @@
         _deprecated_function( __FUNCTION__, '3.9' );
         return $current_site;
 }
+
+/**
+ * Retrieve the main site ID of a given network.
+ *
+ * @param int $network_id ID of the network.
+ *
+ * @return int|bool ID of the main site if found. False if the network ID is invalid.
+ */
+function get_main_site( $network_id = 0 ) {
+        global $wpdb, $current_site, $current_blog;
+
+        if ( 0 === $network_id ) {
+                if ( defined( 'BLOG_ID_CURRENT_SITE' ) ) {
+                        return BLOG_ID_CURRENT_SITE;
+                } elseif ( defined( 'BLOGID_CURRENT_SITE' ) ) { // deprecated.
+                        return BLOGID_CURRENT_SITE;
+                } elseif ( $current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path ) {
+                        return $current_blog->blog_id;
+                } else {
+                        $network = $current_site;
+                }
+        } else {
+                $network = wp_get_network( $network_id );
+        }
+
+        if ( ! $network ) {
+                return false;
+        }
+
+        $site_id = wp_cache_get( 'network:' . $network->id . ':main_site', 'site-options' );
+
+        if ( ! $site_id ) {
+                $site_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s", $network->domain, $network->path ) );
+                wp_cache_add( 'network:' . $network->id . ':main_site', $site_id, 'site-options' );
+        }
+
+        return $site_id;
+}
+ No newline at end of file

src/wp-includes/ms-settings.php

@@ -171 +171 @@
 
         // Figure out the current network's main site.
         if ( ! isset( $current_site->blog_id ) ) {
-                if ( $current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path ) {
-                        $current_site->blog_id = $current_blog->blog_id;
-                } elseif ( ! $current_site->blog_id = wp_cache_get( 'network:' . $current_site->id . ':main_site', 'site-options' ) ) {
-                        $current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s",
-                                $current_site->domain, $current_site->path ) );
-                        wp_cache_add( 'network:' . $current_site->id . ':main_site', $current_site->blog_id, 'site-options' );
-                }
+                $current_site->blog_id = get_main_site();
         }
 
         $blog_id = $current_blog->blog_id;