diff -r 346c88efed21 -r 5e2f62d02dcd wp/wp-includes/ms-default-constants.php
--- a/wp/wp-includes/ms-default-constants.php	Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-includes/ms-default-constants.php	Tue Jun 09 03:35:32 2015 +0200
@@ -45,7 +45,7 @@
  * @since 3.0.0
  */
 function ms_cookie_constants(  ) {
-	global $current_site;
+	$current_site = get_current_site();
 
 	/**
 	 * @since 1.2.0
@@ -116,15 +116,16 @@
  * @since 3.0.0
  */
 function ms_subdomain_constants() {
-	static $error = null;
-	static $error_warn = false;
+	static $subdomain_error = null;
+	static $subdomain_error_warn = null;
 
-	if ( false === $error )
+	if ( false === $subdomain_error ) {
 		return;
+	}
 
-	if ( $error ) {
+	if ( $subdomain_error ) {
 		$vhost_deprecated = __( 'The constant <code>VHOST</code> <strong>is deprecated</strong>. Use the boolean constant <code>SUBDOMAIN_INSTALL</code> in wp-config.php to enable a subdomain configuration. Use is_subdomain_install() to check whether a subdomain configuration is enabled.' );
-		if ( $error_warn ) {
+		if ( $subdomain_error_warn ) {
 			trigger_error( __( '<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.' ) . ' ' . $vhost_deprecated, E_USER_WARNING );
 		} else {
 	 		_deprecated_argument( 'define()', '3.0', $vhost_deprecated );
@@ -133,17 +134,18 @@
 	}
 
 	if ( defined( 'SUBDOMAIN_INSTALL' ) && defined( 'VHOST' ) ) {
-		if ( SUBDOMAIN_INSTALL == ( 'yes' == VHOST ) ) {
-			$error = true;
-		} else {
-			$error = $error_warn = true;
+		$subdomain_error = true;
+		if ( SUBDOMAIN_INSTALL !== ( 'yes' == VHOST ) ) {
+			$subdomain_error_warn = true;
 		}
 	} elseif ( defined( 'SUBDOMAIN_INSTALL' ) ) {
+		$subdomain_error = false;
 		define( 'VHOST', SUBDOMAIN_INSTALL ? 'yes' : 'no' );
 	} elseif ( defined( 'VHOST' ) ) {
-		$error = true;
+		$subdomain_error = true;
 		define( 'SUBDOMAIN_INSTALL', 'yes' == VHOST );
 	} else {
+		$subdomain_error = false;
 		define( 'SUBDOMAIN_INSTALL', false );
 		define( 'VHOST', 'no' );
 	}