diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-08-15 17:04:00 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-08-15 17:04:00 +0000 |
commit | cc6a5e77364bd1ef8b35ac84de469962ab0028a5 (patch) | |
tree | 5ce020efb3aefcf5c29d1e07c85be7f6b41e62c7 | |
parent | 3f977686eee95c98da001dd3652c68200faabfe2 (diff) | |
download | wordpress-mu-cc6a5e77364bd1ef8b35ac84de469962ab0028a5.tar.gz wordpress-mu-cc6a5e77364bd1ef8b35ac84de469962ab0028a5.tar.xz wordpress-mu-cc6a5e77364bd1ef8b35ac84de469962ab0028a5.zip |
Delete new_user_ key when user is added to blog.
Update text to warn of confirmation email
git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1425 7be80a69-a1ef-0310-a953-fb0f7c49ff36
-rw-r--r-- | wp-admin/users.php | 2 | ||||
-rw-r--r-- | wp-includes/wpmu-functions.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/wp-admin/users.php b/wp-admin/users.php index a6fc897..0321cce 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -514,7 +514,7 @@ foreach ( $wp_user_search->get_results() as $userid ) { <form action="" method="post" name="adduser" id="adduser"> <?php wp_nonce_field('add-user') ?> <input type='hidden' name='action' value='addexistinguser'> -<p><?php _e('Type the e-mail address of another user to add them to your blog.')?></p> +<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> <table class="form-table"> <tr class="form-field form-required"> diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php index 567002b..758de63 100644 --- a/wp-includes/wpmu-functions.php +++ b/wp-includes/wpmu-functions.php @@ -1960,6 +1960,7 @@ function add_existing_user_to_blog() { $details = get_option( "new_user_" . $key ); if( is_array( $details ) ) { add_user_to_blog( '', $details[ 'user_id' ], $details[ 'role' ] ); + delete_option( 'new_user_' . $key ); do_action( "added_existing_user", $details[ 'user_id' ] ); 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.' ); } |