From 7a47b7585dac55d96827d4ceb2f39b59ceef2e7f Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 30 Jun 2014 23:50:15 +0000
Subject: [PATCH] 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
---
 wp-includes/ms-settings.php | 4 ++++
 wp-settings.php             | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php
index da7e33f4f2..7b35e7616f 100644
--- a/wp-includes/ms-settings.php
+++ b/wp-includes/ms-settings.php
@@ -10,6 +10,10 @@
  * @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' ) ) {
 	include_once( WP_CONTENT_DIR . '/sunrise.php' );
 }
diff --git a/wp-settings.php b/wp-settings.php
index 060b1b14c5..65e7bf906c 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -91,9 +91,6 @@ 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 );