Changeset 34961

Timestamp:

10/08/2015 09:44:11 PM (9 years ago)

Author:

jeremyfelt

Message:

Make $blog_id explicitly global.

$blog_id is used in both single and multisite configurations as a global variable, though has never been explicitly marked as such in the global scope. This can cause confusion depending on how core is loaded.

Fixes #34217.

Location:

trunk/src

Files:

• wp-includes/default-constants.php (modified) (2 diffs)
• wp-settings.php (modified) (1 diff)

trunk/src/wp-includes/default-constants.php

@@ -12 +12 @@
  *
  * @since 3.0.0
+ *
+ * @global int $blog_id
  */
 function wp_initial_constants() {
@@ -29 +31 @@
     }
 
-    /**
-     * 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;

trunk/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.