WordPress.org

Make WordPress Core

Changeset 28934


Ignore:
Timestamp:
06/30/2014 11:49:34 PM (7 years ago)
Author:
SergeyBiryukov
Message:

Move ms-load.php and ms-default-constants.php inclusion back to ms-settings.php to avoid breaking WP-CLI.

Use require_once() to allow for ms-settings.php to be included multiple times while testing.

props jeremyfelt.
see #27884.

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/ms-settings.php

    r28910 r28934  
    1010 * @since 3.0.0
    1111 */
     12
     13/** Include Multisite initialization functions */
     14require_once( ABSPATH . WPINC . '/ms-load.php' );
     15require_once( ABSPATH . WPINC . '/ms-default-constants.php' );
    1216
    1317if ( defined( 'SUNRISE' ) ) {
  • trunk/src/wp-settings.php

    r28910 r28934  
    9292if ( is_multisite() ) {
    9393    require( ABSPATH . WPINC . '/ms-blogs.php' );
    94     /** Include Multisite initialization functions */
    95     require( ABSPATH . WPINC . '/ms-load.php' );
    96     require( ABSPATH . WPINC . '/ms-default-constants.php' );
    9794    require( ABSPATH . WPINC . '/ms-settings.php' );
    9895} elseif ( ! defined( 'MULTISITE' ) ) {
Note: See TracChangeset for help on using the changeset viewer.