WordPress.org

Make WordPress Core

Changeset 16949


Ignore:
Timestamp:
12/15/10 16:04:19 (5 years ago)
Author:
ryan
Message:

Skip confirmation email fixes. Props ocean90, duck_. see #15725

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/user-new.php

    r16569 r16949  
    109109            } 
    110110            wpmu_signup_user( $new_user_login, $_REQUEST[ 'email' ], array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) ); 
    111             if ( isset( $_POST[ 'adduser' ] ) && isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { 
     111            if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { 
    112112                $key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $_REQUEST[ 'email' ] ) ); 
    113113                wpmu_activate_signup( $key ); 
  • trunk/wp-includes/ms-functions.php

    r16848 r16949  
    13881388        $blog_id = $meta[ 'add_to_blog' ]; 
    13891389        $role = $meta[ 'new_role' ]; 
    1390         remove_user_from_blog($user_id, $current_site->blogid); // remove user from main blog. 
     1390        remove_user_from_blog($user_id, $current_site->blog_id); // remove user from main blog. 
    13911391        add_user_to_blog( $blog_id, $user_id, $role ); 
    13921392        update_user_meta( $user_id, 'primary_blog', $blog_id ); 
Note: See TracChangeset for help on using the changeset viewer.