e42bce8c by Kevin Burton

added additional params for the activate method, allowing to validate against password if needed.

1 parent d7ce04a1
......@@ -163,7 +163,7 @@ function register($username, $email, $password, $meta = Array()) {
* @global $wpdb
* @see wpmu_activate_signup
*/
function activate($key) {
function activate($key, $validate_against_password = false, $pass = '') {
global $wpdb, $current_blog;
$signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->signups} WHERE activation_key = %s", $key));
......@@ -179,6 +179,15 @@ function activate($key) {
// Do I need to re-sanatize this?
$meta = unserialize($signup->meta);
if ($validate_against_password) {
if ($meta['password'] != $pass) {
throw new Exception('Bad password match');
}
}
$id = _create_user($signup->user_login, $meta['password'], $signup->user_email);
unset($meta['password']);
......