Ticket #28530: 28530.diff

wp-admin/network/site-new.php

@@ -75 +75 @@
                 if ( false == $user_id )
                         wp_die( __( 'There was an error creating the user.' ) );
                 else
-                        wp_new_user_notification( $user_id, $password );
+                        wpmu_welcome_user_notification( $user_id, $password );
         }
 
         $wpdb->hide_errors();

wp-admin/network/site-users.php

@@ -73 +73 @@
                                 if ( false == $user_id ) {
                                         $update = 'err_new_dup';
                                 } else {
-                                        wp_new_user_notification( $user_id, $password );
+                                        wpmu_welcome_user_notification( $user_id, $password );
                                         add_user_to_blog( $id, $user_id, $_POST['new_role'] );
                                         $update = 'newuser';
                                 }

wp-admin/network/user-new.php

@@ -50 +50 @@
                 if ( ! $user_id ) {
                         $add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
                 } else {
-                        wp_new_user_notification( $user_id, $password );
+                        wpmu_welcome_user_notification( $user_id, $password );
                         wp_redirect( add_query_arg( array('update' => 'added'), 'user-new.php' ) );
                         exit;
                 }