diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php index d4383d3b91..da7e33f4f2 100644 --- a/wp-includes/ms-settings.php +++ b/wp-includes/ms-settings.php @@ -10,12 +10,9 @@ * @since 3.0.0 */ -/** Include Multisite initialization functions */ -require( ABSPATH . WPINC . '/ms-load.php' ); -require( ABSPATH . WPINC . '/ms-default-constants.php' ); - -if ( defined( 'SUNRISE' ) ) +if ( defined( 'SUNRISE' ) ) { include_once( WP_CONTENT_DIR . '/sunrise.php' ); +} /** Check for and define SUBDOMAIN_INSTALL and the deprecated VHOST constant. */ ms_subdomain_constants(); diff --git a/wp-settings.php b/wp-settings.php index 65e7bf906c..060b1b14c5 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -91,6 +91,9 @@ require( ABSPATH . WPINC . '/default-filters.php' ); // Initialize multisite if enabled. if ( is_multisite() ) { 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' ); } elseif ( ! defined( 'MULTISITE' ) ) { define( 'MULTISITE', false );