Ticket #41936: 41936.2.diff

src/wp-includes/class-wp-network.php

@@ -150 +150 @@
                         case 'blog_id':
                                 return $this->get_main_site_id();
                         case 'site_id':
-                                return (int) $this->get_main_site_id();
+                                return (string) $this->get_main_site_id();
                 }
 
                 return null;
@@ -208 +208 @@
          * properties.
          *
          * @since 4.9.0
-         * @see get_main_site_id()
          *
          * @return string Main site ID as numeric string, for compatibility reasons.
          */
-        private function get_main_site_id() {
-                if ( empty( $this->blog_id ) ) {
-                        $this->blog_id = (string) get_main_site_id( $this->id );
+        public function get_main_site_id() {
+                /**
+                 * Filters the main site ID.
+                 *
+                 * Returning anything other than null will effectively short-circuit the function, returning
+                 * the result parsed as an integer immediately.
+                 *
+                 * @since 4.9.0
+                 *
+                 * @param int|null $main_site_id If anything other than null is returned, it is interpreted as the main site ID.
+                 * @param int $this_id The ID of the network for which the main site was detected.
+                 */
+                $main_site_id = apply_filters( 'pre_get_main_site_id', null, $this->id );
+                if ( null !== $main_site_id ) {
+                        $this->blog_id = (int) $main_site_id;
                 }
+                if ( ! empty( $this->blog_id ) ) {
+                        return $this->blog_id;
+                }
 
+                if ( ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) && $this->domain === DOMAIN_CURRENT_SITE && $this->path === PATH_CURRENT_SITE )
+                     || ( defined( 'SITE_ID_CURRENT_SITE' ) && $this->id == SITE_ID_CURRENT_SITE ) ) {
+                        if ( defined( 'BLOG_ID_CURRENT_SITE' ) ) {
+                                $this->blog_id = (int) BLOG_ID_CURRENT_SITE;
+
+                                return $this->blog_id;
+                        } elseif ( defined( 'BLOGID_CURRENT_SITE' ) ) { // deprecated.
+                                $this->blog_id = (int) BLOGID_CURRENT_SITE;
+
+                                return $this->blog_id;
+                        }
+                }
+
+                $site = get_site();
+                if ( $site->domain === $this->domain && $site->path === $this->path ) {
+                        $main_site_id = $site->id;
+                } else {
+                        $main_site_id = wp_cache_get( 'network:' . $this->id . ':main_site', 'site-options' );
+                        if ( false === $main_site_id ) {
+                                $_sites       = get_sites( array(
+                                        'fields'     => 'ids',
+                                        'number'     => 1,
+                                        'domain'     => $this->domain,
+                                        'path'       => $this->path,
+                                        'network_id' => $this->id,
+                                ) );
+                                $main_site_id = ! empty( $_sites ) ? array_shift( $_sites ) : 0;
+
+                                wp_cache_add( 'network:' . $this->id . ':main_site', $main_site_id, 'site-options' );
+                        }
+                }
+
+                $this->blog_id = (int) $main_site_id;
+
+
                 return $this->blog_id;
         }
 

src/wp-includes/functions.php

@@ -4408 +4408 @@
         }
 
         $site_id = (int) $site_id;
-
-        return $site_id === get_main_site_id( $network_id );
+//var_dump($site_id,get_network( $network_id )->site_id, "");
+        return $site_id === get_network( $network_id )->site_id;
 }
 
 /**
@@ -4423 +4423 @@
  */
 function get_main_site_id( $network_id = null ) {
         if ( ! is_multisite() ) {
-                return 1;
+                return get_current_blog_id();
         }
 
         $network = get_network( $network_id );
@@ -4431 +4431 @@
                 return 0;
         }
 
-        /**
-         * Filters the main site ID.
-         *
-         * Returning anything other than null will effectively short-circuit the function, returning
-         * the result parsed as an integer immediately.
-         *
-         * @since 4.9.0
-         *
-         * @param int|null $main_site_id If anything other than null is returned, it is interpreted as the main site ID.
-         * @param int $network_id The ID of the network for which the main site was detected.
-         */
-        $main_site_id = apply_filters( 'pre_get_main_site_id', null, $network->id );
-        if ( null !== $main_site_id ) {
-                return (int) $main_site_id;
-        }
-
-        if ( ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) && $network->domain === DOMAIN_CURRENT_SITE && $network->path === PATH_CURRENT_SITE )
-             || ( defined( 'SITE_ID_CURRENT_SITE' ) && $network->id == SITE_ID_CURRENT_SITE ) ) {
-                if ( defined( 'BLOG_ID_CURRENT_SITE' ) ) {
-                        return BLOG_ID_CURRENT_SITE;
-                } elseif ( defined( 'BLOGID_CURRENT_SITE' ) ) { // deprecated.
-                        return BLOGID_CURRENT_SITE;
-                }
-        }
-
-        $site = get_site();
-        if ( $site->domain === $network->domain && $site->path === $network->path ) {
-                $main_site_id = (int) $site->id;
-        } else {
-                $main_site_id = wp_cache_get( 'network:' . $network->id . ':main_site', 'site-options' );
-                if ( false === $main_site_id ) {
-                        $_sites = get_sites( array(
-                                'fields'     => 'ids',
-                                'number'     => 1,
-                                'domain'     => $network->domain,
-                                'path'       => $network->path,
-                                'network_id' => $network->id,
-                        ) );
-                        $main_site_id = ! empty( $_sites ) ? array_shift( $_sites ) : 0;
-
-                        wp_cache_add( 'network:' . $network->id . ':main_site', $main_site_id, 'site-options' );
-                }
-        }
-
-        return (int) $main_site_id;
+        return $network->site_id;
 }
 
 /**

src/wp-includes/ms-load.php

@@ -422 +422 @@
         }
 
         // Figure out the current network's main site.
-        if ( empty( $current_site->blog_id ) ) {
-                $current_site->blog_id = get_main_site_id( $current_site->id );
-        }
+        $current_site->get_main_site_id();
 
         return true;
 }

tests/phpunit/tests/multisite/site.php

@@ -14 +14 @@
         protected static $site_ids;
 
         function setUp() {
-                global $wpdb;
+                global $wpdb, $current_site;
                 parent::setUp();
                 $this->suppress = $wpdb->suppress_errors();
+                $current_site->site_id = 0;
+                $current_site->blog_id = 0;
         }
 
         function tearDown() {