Wordpress 3.5

[autoinstalls/wordpress.git] / wp-admin / network / users.php

diff --git a/wp-admin/network/users.php b/wp-admin/network/users.php
index 25d853d9f0be930fea064c3b0088ce3d777ab5a7..1318355448add4d3eaf4a33e0bc729dafef80d1e 100644 (file)
--- a/wp-admin/network/users.php
+++ b/wp-admin/network/users.php
@@ -24,7 +24,7 @@ function confirm_delete_users( $users ) {
        screen_icon();
        ?>
        <h2><?php esc_html_e( 'Users' ); ?></h2>
-       <p><?php _e( 'Transfer or delete posts and links before deleting users.' ); ?></p>
+       <p><?php _e( 'Transfer or delete posts before deleting users.' ); ?></p>
        <form action="users.php?action=dodelete" method="post">
        <input type="hidden" name="dodelete" />
        <?php
@@ -34,20 +34,20 @@ function confirm_delete_users( $users ) {
 
        foreach ( ( $allusers = (array) $_POST['allusers'] ) as $key => $val ) {
                if ( $val != '' && $val != '0' ) {
-                       $delete_user = new WP_User( $val );
+                       $delete_user = get_userdata( $val );
 
                        if ( ! current_user_can( 'delete_user', $delete_user->ID ) )
                                wp_die( sprintf( __( 'Warning! User %s cannot be deleted.' ), $delete_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 ) );
+                               wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network administrator.' ), $delete_user->user_login ) );
 
                        echo "<input type='hidden' name='user[]' value='{$val}'/>\n";
                        $blogs = get_blogs_of_user( $val, true );
 
                        if ( !empty( $blogs ) ) {
                                ?>
-                               <br /><fieldset><p><legend><?php printf( __( "What should be done with posts and links owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p>
+                               <br /><fieldset><p><legend><?php printf( __( "What should be done with posts owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p>
                                <?php
                                foreach ( (array) $blogs as $key => $details ) {
                                        $blog_users = get_users( array( 'blog_id' => $details->userblog_id ) );
@@ -67,9 +67,9 @@ function confirm_delete_users( $users ) {
                                                <ul style="list-style:none;">
                                                        <li><?php printf( __( 'Site: %s' ), $user_site ); ?></li>
                                                        <li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="delete" checked="checked" />
-                                                       <?php _e( 'Delete all posts and links.' ); ?></label></li>
+                                                       <?php _e( 'Delete all posts.' ); ?></label></li>
                                                        <li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="reassign" />
-                                                       <?php echo __( 'Attribute all posts and links to:' ) . '</label>' . $user_dropdown; ?></li>
+                                                       <?php echo __( 'Attribute all posts to:' ) . '</label>' . $user_dropdown; ?></li>
                                                </ul>
                                                <?php
                                        }
@@ -119,9 +119,7 @@ if ( isset( $_GET['action'] ) ) {
                        if ( ( isset( $_POST['action']) || isset($_POST['action2'] ) ) && isset( $_POST['allusers'] ) ) {
                                check_admin_referer( 'bulk-users-network' );
 
-                               if ( $_GET['action'] != -1 || $_POST['action2'] != -1 )
-                                       $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
-
+                               $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
                                $userfunction = '';
 
                                foreach ( (array) $_POST['allusers'] as $key => $val ) {
@@ -136,13 +134,13 @@ if ( isset( $_GET['action'] ) ) {
                                                                echo '<div class="wrap">';
                                                                confirm_delete_users( $_POST['allusers'] );
                                                                echo '</div>';
-                                                   require_once( '../admin-footer.php' );
-                                                   exit();
-                                               break;
+                                                               require_once( '../admin-footer.php' );
+                                                               exit();
+                                                       break;
 
                                                        case 'spam':
-                                                               $user = new WP_User( $val );
-                                                               if ( in_array( $user->user_login, get_super_admins() ) )
+                                                               $user = get_userdata( $val );
+                                                               if ( is_super_admin( $user->ID ) )
                                                                        wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network administrator.' ), esc_html( $user->user_login ) ) );
 
                                                                $userfunction = 'all_spam';
@@ -290,7 +288,7 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
        <?php $wp_list_table->views(); ?>
 
        <form action="" method="get" class="search-form">
-               <?php $wp_list_table->search_box( __( 'Search Users' ), 'user' ); ?>
+               <?php $wp_list_table->search_box( __( 'Search Users' ), 'all-user' ); ?>
        </form>
 
        <form id="form-user-list" action='users.php?action=allusers' method='post'>