Ticket #34217: 34217.diff

src/wp-includes/default-constants.php

@@ -11 +11 @@
  * @see wp_debug_mode()
  *
  * @since 3.0.0
+ *
+ * @global int $blog_id
  */
 function wp_initial_constants() {
         global $blog_id;
@@ -28 +30 @@
                 define( 'WP_MAX_MEMORY_LIMIT', '256M' );
         }
 
-        /**
-         * The $blog_id global, which you can change in the config allows you to create a simple
-         * multiple blog installation using just one WordPress and changing $blog_id around.
-         *
-         * @global int $blog_id
-         * @since 2.0.0
-         */
         if ( ! isset($blog_id) )
                 $blog_id = 1;
 

src/wp-settings.php

@@ -29 +29 @@
 global $wp_version, $wp_db_version, $tinymce_version, $required_php_version, $required_mysql_version;
 require( ABSPATH . WPINC . '/version.php' );
 
+/**
+ * If not already configured, `$blog_id` will default to 1 in a single site
+ * configuration. In multisite, it will be overridden by default in ms-settings.php.
+ *
+ * @global int $blog_id
+ * @since 2.0.0
+ */
+global $blog_id;
+
 // Set initial default constants including WP_MEMORY_LIMIT, WP_MAX_MEMORY_LIMIT, WP_DEBUG, SCRIPT_DEBUG, WP_CONTENT_DIR and WP_CACHE.
 wp_initial_constants();