Ticket #27884: 27884.3.diff

src/wp-includes/ms-settings.php

@@ -9 +9 @@
  * @subpackage Multisite
  * @since 3.0.0
  */
+require_once( ABSPATH . WPINC . '/ms-load.php' );
+require_once( ABSPATH . WPINC . '/ms-default-constants.php' );
 
 if ( defined( 'SUNRISE' ) ) {
         include_once( WP_CONTENT_DIR . '/sunrise.php' );

src/wp-settings.php

@@ -92 +92 @@
 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 );