Changeset 1426

Show
Ignore:
Timestamp:
08/15/08 17:05:59 (4 months ago)
Author:
donncha
Message:

Add user updates from 2.6 branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/users.php

    r1395 r1426  
    515515<?php wp_nonce_field('add-user') ?> 
    516516<input type='hidden' name='action' value='addexistinguser'> 
    517 <p><?php _e('Type the e-mail address of another user to add them to your blog.')?></p> 
     517<p><?php _e('Type the e-mail address of another user to add them to your blog. They will be sent a confirmation email with a link to click before they are added.')?></p> 
    518518 
    519519<table class="form-table"> 

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

    r1413 r1426  
    19611961                if( is_array( $details ) ) { 
    19621962                        add_user_to_blog( '', $details[ 'user_id' ], $details[ 'role' ] ); 
     1963                        delete_option( 'new_user_' . $key ); 
    19631964                        do_action( "added_existing_user", $details[ 'user_id' ] ); 
    19641965                        wp_die( 'You have been added to this blog. Please visit the <a href="' . site_url() . '">homepage</a> or <a href="' . site_url( '/wp-admin/' ) . '">login</a> using your username and password.' );