Ticket #27884: unit-hack.diff

src/wp-includes/ms-settings.php

@@ -10 +10 @@
  * @since 3.0.0
  */
 
-/** Include Multisite initialization functions */
-require( ABSPATH . WPINC . '/ms-load.php' );
-require( ABSPATH . WPINC . '/ms-default-constants.php' );
 
-if ( defined( 'SUNRISE' ) )
-        include_once( WP_CONTENT_DIR . '/sunrise.php' );
 
-/** Check for and define SUBDOMAIN_INSTALL and the deprecated VHOST constant. */
-ms_subdomain_constants();
-
 if ( !isset( $current_site ) || !isset( $current_blog ) ) {
 
         // Given the domain and path, let's try to identify the network and site.

src/wp-settings.php

@@ -91 +91 @@
 // 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' );
+
+        if ( defined( 'SUNRISE' ) ) {
+                include_once( WP_CONTENT_DIR . '/sunrise.php' );
+        }
+
+        /** Check for and define SUBDOMAIN_INSTALL and the deprecated VHOST constant. */
+        ms_subdomain_constants();
+
         require( ABSPATH . WPINC . '/ms-settings.php' );
 } elseif ( ! defined( 'MULTISITE' ) ) {
         define( 'MULTISITE', false );