Ticket #29684: 29684.3.diff

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

@@ -157 +157 @@
                         case 'id':
                                 return (int) $this->id;
                         case 'blog_id':
+                                $this->get_blog_id();
                                 return $this->blog_id;
                         case 'site_id':
+                                $this->get_blog_id();
                                 return (int) $this->blog_id;
                 }
 
@@ -405 +407 @@
 
                 return false;
         }
+
+        private function get_blog_id() {
+                global $wpdb;
+                if ( empty( $this->blog_id ) ) {
+                        $blog_id = get_network_option( $this->id, 'main_site' );
+                        if ( ! $blog_id ) {
+                                $blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s", $this->domain, $this->path ) );
+                                if ( ! $blog_id ) {
+                                        add_network_option( $this->id, 'main_site', $blog_id );
+                                }
+                        }
+                        if ( $blog_id ) {
+                                $this->blog_id = $blog_id;
+                        }
+                }
+        }
 }

src/wp-includes/ms-load.php

@@ -426 +426 @@
         if ( empty( $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' ) ) {
+                } elseif ( ! $current_site->blog_id = get_network_option( $current_site->id, 'main_site' ) ) {
                         $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' );
+                        add_network_option( $current_site->id, 'main_site', $current_site->blog_id );
                 }
         }