Ticket #20825: 20825.diff

src/wp-includes/ms-settings.php

@@ -115 +115 @@
 
         if ( ! $blog_id ) {
                 if ( defined( 'WP_INSTALLING' ) ) {
-                        $current_blog->blog_id = $blog_id = 1;
+                        // in multisite, the main blog may not be always the first one!!
+                        $current_blog->blog_id = $blog_id = ( defined('BLOG_ID_CURRENT_SITE') ? BLOG_ID_CURRENT_SITE : 1 ) ;
                 } else {
                         wp_load_translations_early();
                         $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . __( 'Database tables are missing.' ) : '';