Changeset 924

Show
Ignore:
Timestamp:
03/20/07 16:50:35 (2 years ago)
Author:
donncha
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/wpmu-functions.php

    r914 r924  
    10641064                $admin_email = 'support@' . $_SERVER[ 'SERVER_NAME' ]; 
    10651065        $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"; 
    1066         $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" ); 
     1066        $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" ); 
    10671067        // TODO: Don't hard code activation link. 
    10681068        $subject = sprintf(__('Activate %s'), $user); 
    …… 
    11041104                        return new WP_Error('user_already_exists', __('That username is already activated.'), $signup); 
    11051105                wpmu_welcome_user_notification($user_id, $password, $meta); 
     1106                add_user_to_blog('1', $user_id, 'subscriber'); 
    11061107                do_action('wpmu_activate_user', $user_id, $password, $meta); 
    11071108                return array('user_id' => $user_id, 'password' => $password, 'meta' => $meta);