Ticket #15173: 15173.2.diff

wp-includes/ms-functions.php

@@ -866 +866 @@
                 if ( isset( $user_already_exists ) )
                         return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
 
-                wpmu_welcome_user_notification($user_id, $password, $meta);
+                wpmu_welcome_user_notification( $user_id, $password, $meta );
 
-                add_new_user_to_blog( $user_id, $user_email, $meta );
-                do_action('wpmu_activate_user', $user_id, $password, $meta);
-                return array('user_id' => $user_id, 'password' => $password, 'meta' => $meta);
+                do_action( 'wpmu_activate_user', $user_id, $password, $meta );
+                return array( 'user_id' => $user_id, 'password' => $password, 'meta' => $meta );
         }
 
         $blog_id = wpmu_create_blog( $signup->domain, $signup->path, $signup->title, $user_id, $meta, $wpdb->siteid );