From 6388f7113b880f1f704645c2525a4cd35c07eeb8 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Thu, 7 Jan 2010 10:52:21 +0000
Subject: [PATCH] Check if VHOST is defined in get_id_from_blogname()

git-svn-id: https://develop.svn.wordpress.org/trunk@12643 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/ms-functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index cf36579223..228fd967f5 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -105,10 +105,10 @@ function is_main_blog() {
 function get_id_from_blogname( $name ) {
 	global $wpdb, $current_site;
 	$blog_id = wp_cache_get( "get_id_from_blogname_" . $name, 'blog-details' );
-	if( $blog_id )
+	if ( $blog_id )
 		return $blog_id;
 
-	if( constant( 'VHOST' ) == 'yes' ) {
+	if ( defined('VHOST') && constant( 'VHOST' ) == 'yes' ) {
 		$domain = $name . '.' . $current_site->domain;
 		$path = $current_site->path;
 	} else {