Installer, signup and vhosts lookup fixes

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

1 files changed, 3 insertions, 4 deletions

diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php
index 4dd1269..a84be1d 100644
--- a/wp-includes/wpmu-functions.php
+++ b/wp-includes/wpmu-functions.php
@@ -1026,10 +1026,10 @@ function wpmu_signup_blog_notification($domain, $path, $title, $user, $user_emai
 	if( constant( "VHOST" ) == 'no' ) {
 		$activate_url = "http://" . $current_site->domain . $current_site->path . "wp-activate.php?key=$key";
 	} else {
-		$activate_url = "http://{$domain}{$path}/wp-activate.php?key=$key";
+		$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key";
 	}
 	$message_headers = 'From: ' . stripslashes($title) . ' <support@' . $_SERVER[ 'SERVER_NAME' ] . '>';
-	$message = sprintf(__("To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your blog here:\n\n%s"), $activate_url, "http://$domain.$path");
+	$message = sprintf(__("To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your blog here:\n\n%s"), $activate_url, "http://{$domain}{$path}");
 	// TODO: Don't hard code activation link.
 	$subject = sprintf(__('Activate %s'), $domain.$path);
 	wp_mail($user_email, $subject, $message, $message_headers);
@@ -1038,8 +1038,7 @@ function wpmu_signup_blog_notification($domain, $path, $title, $user, $user_emai
 function wpmu_signup_user_notification($user, $user_email, $key, $meta = '') {
 	// Send email with activation link.
 	$message_headers = 'From: ' . stripslashes($user) . ' <support@' . $_SERVER[ 'SERVER_NAME' ] . '>';
-	$message = sprintf(__("To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\n"), 
-		"http://{$_SERVER[ 'SERVER_NAME' ]}/wp-activate.php?key=$key", "http://{$_SERVER[ 'SERVER_NAME' ]}");
+	$message = sprintf(__("To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\n"), "http://{$_SERVER[ 'SERVER_NAME' ]}/wp-activate.php?key=$key" );
 	// TODO: Don't hard code activation link.
 	$subject = sprintf(__('Activate %s'), $user);
 	wp_mail($user_email, $subject, $message, $message_headers);