Ticket #16455: 16455.diff

wp-includes/load.php

@@ -639 +639 @@
         if ( defined( 'MULTISITE' ) )
                 return MULTISITE;
 
-        if ( defined( 'SUBDOMAIN_INSTALL' ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) )
+        if ( is_subdomain_install() )
                 return true;
 
+        if ( defined( 'SUNRISE' ) )
+                return true;
+
         return false;
 }
 

wp-includes/ms-load.php

@@ -16 +16 @@
  * @return bool True if subdomain configuration is enabled, false otherwise.
  */
 function is_subdomain_install() {
-        if ( defined('SUBDOMAIN_INSTALL') )
+        if ( defined('SUBDOMAIN_INSTALL') && SUBDOMAIN_INSTALL == true)
                 return SUBDOMAIN_INSTALL;
 
         if ( defined('VHOST') && VHOST == 'yes' )