WordPress.org

Make WordPress Core

Changeset 34961


Ignore:
Timestamp:
10/08/2015 09:44:11 PM (4 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/default-constants.php

    r34912 r34961  
    1212 *
    1313 * @since 3.0.0
     14 *
     15 * @global int $blog_id
    1416 */
    1517function wp_initial_constants() {
     
    2931    }
    3032
    31     /**
    32      * The $blog_id global, which you can change in the config allows you to create a simple
    33      * multiple blog installation using just one WordPress and changing $blog_id around.
    34      *
    35      * @global int $blog_id
    36      * @since 2.0.0
    37      */
    3833    if ( ! isset($blog_id) )
    3934        $blog_id = 1;
  • trunk/src/wp-settings.php

    r34928 r34961  
    2929global $wp_version, $wp_db_version, $tinymce_version, $required_php_version, $required_mysql_version;
    3030require( ABSPATH . WPINC . '/version.php' );
     31
     32/**
     33 * If not already configured, `$blog_id` will default to 1 in a single site
     34 * configuration. In multisite, it will be overridden by default in ms-settings.php.
     35 *
     36 * @global int $blog_id
     37 * @since 2.0.0
     38 */
     39global $blog_id;
    3140
    3241// Set initial default constants including WP_MEMORY_LIMIT, WP_MAX_MEMORY_LIMIT, WP_DEBUG, SCRIPT_DEBUG, WP_CONTENT_DIR and WP_CACHE.
Note: See TracChangeset for help on using the changeset viewer.