Fix activate link

Add username only signup to main blog as "subscriber" (fixes #253)


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

1 files changed, 2 insertions, 1 deletions

diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php
index e7cc511..1ab7b1d 100644
--- a/wp-includes/wpmu-functions.php
+++ b/wp-includes/wpmu-functions.php
@@ -1063,7 +1063,7 @@ function wpmu_signup_user_notification($user, $user_email, $key, $meta = '') {
 	if( $admin_email == '' )
 		$admin_email = 'support@' . $_SERVER[ 'SERVER_NAME' ];
 	$message_headers = "MIME-Version: 1.0\n" . "From: " . get_site_option( "site_name" ) .  " <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
-	$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://{$current_site->domain}{$current_site->path}/wp-activate.php?key=$key" );
+	$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://{$current_site->domain}{$current_site->path}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);
@@ -1103,6 +1103,7 @@ function wpmu_activate_signup($key) {
 		if ( isset($user_already_exists) )
 			return new WP_Error('user_already_exists', __('That username is already activated.'), $signup);
 		wpmu_welcome_user_notification($user_id, $password, $meta);
+		add_user_to_blog('1', $user_id, 'subscriber');
 		do_action('wpmu_activate_user', $user_id, $password, $meta);
 		return array('user_id' => $user_id, 'password' => $password, 'meta' => $meta);
 	}