Ticket #16455: 16455v2.diff

wp-includes/load.php

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