From 4695573f512d31f348ba2b30178ee13f18879daf Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Sun, 29 Jun 2014 22:51:16 +0000
Subject: [PATCH] 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
---
 wp-includes/ms-settings.php | 7 ++-----
 wp-settings.php             | 3 +++
 2 files changed, 5 insertions(+), 5 deletions(-)

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 );