Changeset 16949

Timestamp:

12/15/2010 04:04:19 PM (14 years ago)

Author:

ryan

Message:

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

Location:

trunk

Files:

• wp-admin/user-new.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (1 diff)

trunk/wp-admin/user-new.php

@@ -109 +109 @@
             }
             wpmu_signup_user( $new_user_login, $_REQUEST[ 'email' ], array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) );
-            if ( isset( $_POST[ 'adduser' ] ) && isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
+            if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
                 $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' ] ) );
                 wpmu_activate_signup( $key );

trunk/wp-includes/ms-functions.php

@@ -1388 +1388 @@
         $blog_id = $meta[ 'add_to_blog' ];
         $role = $meta[ 'new_role' ];
-        remove_user_from_blog($user_id, $current_site->blogid); // remove user from main blog.
+        remove_user_from_blog($user_id, $current_site->blog_id); // remove user from main blog.
         add_user_to_blog( $blog_id, $user_id, $role );
         update_user_meta( $user_id, 'primary_blog', $blog_id );