Ticket #14670: singlesite.diff

wp-includes/default-constants.php

@@ -64 +64 @@
 
         if ( !defined('SHORTINIT') )
                 define('SHORTINIT', false);
+
+        if ( !defined( 'SINGLESITE' ) )
+                define( 'SINGLESITE', ! defined( 'MULTISITE' ) || ! MULTISITE );
+
 }
 
 /**

wp-includes/load.php

@@ -622 +622 @@
  * @return bool True if multisite is enabled, false otherwise.
  */
 function is_multisite() {
+        if ( defined( 'SINGLESITE' ) )
+                return SINGLESITE;
+
         if ( defined( 'MULTISITE' ) )
                 return MULTISITE;
 

wp-settings.php

@@ -13 +13 @@
  *
  * @since 1.0.0
  */
+
 define( 'WPINC', 'wp-includes' );
 
 // Include files required for initialization.
@@ -86 +87 @@
 if ( is_multisite() ) {
         require( ABSPATH . WPINC . '/ms-blogs.php' );
         require( ABSPATH . WPINC . '/ms-settings.php' );
-} elseif ( ! defined( 'MULTISITE' ) ) {
+} elseif ( SINGLESITE || ! defined( 'MULTISITE' ) ) {
         define( 'MULTISITE', false );
+        if ( defined( 'SUNRISE' ) )
+                include_once( WP_CONTENT_DIR . '/sunrise.php' );
 }
 
 // Stop most of WordPress from being loaded if we just want the basics.