Changeset 13506

Timestamp:

02/28/2010 07:24:25 PM (11 years ago)

Author:

wpmuguru

Message:

more ms delete user tweaks, props ocean90, see #12386

File:

• trunk/wp-admin/includes/ms.php (modified) (3 diffs)

trunk/wp-admin/includes/ms.php

@@ -181 +181 @@
     $admin_out = "<option value='$current_user->ID'>$current_user->user_login</option>";
 
-    foreach ( (array) $_POST['allusers'] as $key => $val ) {
+    foreach ( ( $allusers = (array) $_POST['allusers'] ) as $key => $val ) {
         if ( $val != '' && $val != '0' ) {
-            $allusers[] = $val;
-            $user = new WP_User( $val );
+            $delete_user = new WP_User( $val );
             
-            if ( in_array( $user->user_login, $site_admins ) )
-                wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network admnistrator.' ), $user->user_login ) );
+            if ( in_array( $delete_user->user_login, $site_admins ) )
+                wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network admnistrator.' ), $delete_user->user_login ) );
                 
             echo "<input type='hidden' name='user[]' value='{$val}'/>\n";
@@ -193 +192 @@
             
             if ( !empty( $blogs ) ) {
-                echo '<p><strong>' . sprintf( __( 'Blogs from %s:' ), $user->user_login ) . '</strong></p>';
+                echo '<p><strong>' . sprintf( __( 'Sites from %s:' ), $delete_user->user_login ) . '</strong></p>';
                 foreach ( (array) $blogs as $key => $details ) {
                     $blog_users = get_users_of_blog( $details->userblog_id );
@@ -201 +200 @@
                         $out = '';
                         foreach ( $blog_users as $user ) {
-                            if ( $user->user_id != $val && !in_array( $val, $allusers ) )
+                            if ( $user->user_id != $val && !in_array( $user->user_id, $allusers ) )
                                 $out .= "<option value='{$user->user_id}'>{$user->user_login}</option>";
                         }