WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
Built from https://develop.svn.wordpress.org/trunk@28934


git-svn-id: http://core.svn.wordpress.org/trunk@28732 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2014-06-30 23:50:15 +00:00
parent f7703c03d3
commit 7a47b7585d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/ms-settings.php
View File

@ -10,6 +10,10 @@
* @since 3.0.0 * @since 3.0.0
*/ */
/** Include Multisite initialization functions */
require_once( ABSPATH . WPINC . '/ms-load.php' );
require_once( ABSPATH . WPINC . '/ms-default-constants.php' );
if ( defined( 'SUNRISE' ) ) { if ( defined( 'SUNRISE' ) ) {
include_once( WP_CONTENT_DIR . '/sunrise.php' ); include_once( WP_CONTENT_DIR . '/sunrise.php' );
} }

3
wp-settings.php
View File

@ -91,9 +91,6 @@ require( ABSPATH . WPINC . '/default-filters.php' );
// Initialize multisite if enabled. // Initialize multisite if enabled.
if ( is_multisite() ) { if ( is_multisite() ) {
require( ABSPATH . WPINC . '/ms-blogs.php' ); require( ABSPATH . WPINC . '/ms-blogs.php' );
/** Include Multisite initialization functions */
require( ABSPATH . WPINC . '/ms-load.php' );
require( ABSPATH . WPINC . '/ms-default-constants.php' );
require( ABSPATH . WPINC . '/ms-settings.php' ); require( ABSPATH . WPINC . '/ms-settings.php' );
} elseif ( ! defined( 'MULTISITE' ) ) { } elseif ( ! defined( 'MULTISITE' ) ) {
define( 'MULTISITE', false ); define( 'MULTISITE', false );