Changeset 28934

Timestamp:

06/30/2014 11:49:34 PM (11 years ago)

Author:

SergeyBiryukov

Message:

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.

Location:

trunk/src

Files:

• wp-includes/ms-settings.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/src/wp-includes/ms-settings.php

@@ -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' ) ) {

trunk/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' ) ) {