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

Add initial unit tests for multisite's bootstrap. 

props jeremyfelt.
fixes #27884.

Built from https://develop.svn.wordpress.org/trunk@28910


git-svn-id: http://core.svn.wordpress.org/trunk@28709 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2014-06-29 22:51:16 +00:00
parent a10aff4d92
commit 4695573f51
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,12 +10,9 @@
* @since 3.0.0 * @since 3.0.0
*/ */
/** Include Multisite initialization functions */ if ( defined( 'SUNRISE' ) ) {
require( ABSPATH . WPINC . '/ms-load.php' );
require( ABSPATH . WPINC . '/ms-default-constants.php' );
if ( defined( 'SUNRISE' ) )
include_once( WP_CONTENT_DIR . '/sunrise.php' ); include_once( WP_CONTENT_DIR . '/sunrise.php' );
}
/** Check for and define SUBDOMAIN_INSTALL and the deprecated VHOST constant. */ /** Check for and define SUBDOMAIN_INSTALL and the deprecated VHOST constant. */
ms_subdomain_constants(); ms_subdomain_constants();

3
wp-settings.php
View File

@ -91,6 +91,9 @@ 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 );