When deleting user, list user_id seperately to blogs for users without blogs

git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1453 7be80a69-a1ef-0310-a953-fb0f7c49ff36

2 files changed, 20 insertions, 14 deletions

diff --git a/wp-admin/includes/mu.php b/wp-admin/includes/mu.php
index f51e1b9..41c4a2b 100644
--- a/wp-admin/includes/mu.php
+++ b/wp-admin/includes/mu.php
@@ -136,21 +136,24 @@ function confirm_delete_users( $users ) {
 	wp_nonce_field( 'allusers' );
 	foreach ( (array) $_POST['allusers'] as $key => $val ) {
 		if( $val != '' && $val != '0' && $val != '1' ) {
+			echo "<input type='hidden' name='user[]' value='{$val}'/>\n";
 			$blogs = get_blogs_of_user( $val, true );
-			foreach ( (array) $blogs as $key => $details ) {
-				$blog_users = get_users_of_blog( $details->userblog_id );
-				if( is_array( $blog_users ) && !empty( $blog_users ) ) {
-					echo "<p><a href='http://{$details->domain}{$details->path}'>{$details->blogname}</a> ";
-					echo "<select name='blog[$val][{$key}]'>";
-					$out = '';
-					foreach( $blog_users as $user ) {
-						if( $user->user_id != $val )
-							$out .= "<option value='{$user->user_id}'> {$user->user_login}";
+			if( !empty( $blogs ) ) {
+				foreach ( (array) $blogs as $key => $details ) {
+					$blog_users = get_users_of_blog( $details->userblog_id );
+					if( is_array( $blog_users ) && !empty( $blog_users ) ) {
+						echo "<p><a href='http://{$details->domain}{$details->path}'>{$details->blogname}</a> ";
+						echo "<select name='blog[$val][{$key}]'>";
+						$out = '';
+						foreach( $blog_users as $user ) {
+							if( $user->user_id != $val )
+								$out .= "<option value='{$user->user_id}'> {$user->user_login}";
+						}
+						if( $out == '' )
+							$out = "<option value='1'> admin";
+						echo $out;
+						echo "</select>\n";
 					}
-					if( $out == '' )
-						$out = "<option value='1'> admin";
-					echo $out;
-					echo "</select>\n";
 				}
 			}
 		}
diff --git a/wp-admin/wpmu-edit.php b/wp-admin/wpmu-edit.php
index a039a85..7e4b3f6 100644
--- a/wp-admin/wpmu-edit.php
+++ b/wp-admin/wpmu-edit.php
@@ -405,9 +405,12 @@ switch( $_GET['action'] ) {
 					foreach( $users as $blogid => $user_id ) {
 						$wpdb->query( "UPDATE {$wpdb->base_prefix}{$blogid}_posts SET post_author = '{$user_id}' WHERE post_author = '{$id}'" );
 					}
-					wpmu_delete_user( $id );
 				}
 			}
+			if( is_array( $_POST[ 'user' ] ) && !empty( $_POST[ 'user' ] ) )
+				foreach( $_POST[ 'user' ] as $id )
+					wpmu_delete_user( $id );
+
 			wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'all_delete'), 'wpmu-users.php' ) );
 		} else {
 		foreach ( (array) $_POST['allusers'] as $key => $val ) {