No more mangled URLs when creating blogs through a www. url hopefully

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@914 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 2 insertions, 7 deletions

diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php
index 55aef90..e7cc511 100644
--- a/wp-includes/wpmu-functions.php
+++ b/wp-includes/wpmu-functions.php
@@ -78,12 +78,7 @@ function get_blogaddress_by_id( $blog_id ) {
 	global $hostname, $domain, $base, $wpdb;
 
 	$bloginfo = get_blog_details( $blog_id, false ); // only get bare details!
-
-	if( defined( "VHOST" ) && constant( "VHOST" ) == 'yes' ) {
-		return "http://" . $bloginfo->domain . $bloginfo->path;
-	} else {
-		return get_blogaddress_by_domain($bloginfo->domain, $bloginfo->path);
-	}
+	return "http://" . $bloginfo->domain . $bloginfo->path;
 }
 
 function get_blogaddress_by_name( $blogname ) {
@@ -258,7 +253,7 @@ function get_site_option( $key, $default = false, $use_cache = true ) {
 function add_site_option( $key, $value ) {
 	global $wpdb;
 
-	$exists = $wpdb->get_var("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = '$key' AND site_id = '$wpdb->siteid'");
+	$exists = $wpdb->get_var("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = '$key' AND site_id = '{$wpdb->siteid}'");
 
 	if ( null !== $exists ) // If we already have it
 		return false;