Deprecate VHOST in favor of a boolean, SUBDOMAIN_INSTALL. Core will keep VHOST defined for plugins' sake, but you should only define SUBDOMAIN_INSTALL. Throws a notice if VHOST is defined, and a warning if they somehow conflict. Sunrise can still handle them. fixes #11796.

git-svn-id: https://develop.svn.wordpress.org/trunk@14452 602fd350-edb4-49c9-b593-d223f7449a82

wp-includes/ms-settings.php

@@ -21,6 +21,9 @@ 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 ) ) {
 
 	$domain = addslashes( $_SERVER['HTTP_HOST'] );