Changeset 28934 for trunk/src/wp-settings.php

Timestamp:

06/30/2014 11:49:34 PM (10 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.

File:

• trunk/src/wp-settings.php (modified) (1 diff)

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