WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check if VHOST is defined in get_id_from_blogname() 

git-svn-id: http://svn.automattic.com/wordpress/trunk@12643 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2010-01-07 10:52:21 +00:00
parent 36b2df4606
commit 40efc5b7f4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/ms-functions.php
View File

@ -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 {