WordPress 4.0.1-scripts

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

diff --git a/wp-admin/network/users.php b/wp-admin/network/users.php
index fd50b21823a08afa2845dcea2c305430acc25c6e..39ab1b5a0d06511e1984a1f9438e5fd063701ac4 100644 (file)
--- a/wp-admin/network/users.php
+++ b/wp-admin/network/users.php
@@ -22,13 +22,13 @@ function confirm_delete_users( $users ) {
                return false;
        ?>
        <h2><?php esc_html_e( 'Users' ); ?></h2>
-       <p><?php _e( 'Transfer or delete posts before deleting users.' ); ?></p>
+       <p><?php _e( 'Transfer or delete content before deleting users.' ); ?></p>
        <form action="users.php?action=dodelete" method="post">
        <input type="hidden" name="dodelete" />
        <?php
        wp_nonce_field( 'ms-users-delete' );
        $site_admins = get_super_admins();
-       $admin_out = "<option value='$current_user->ID'>$current_user->user_login</option>";
+       $admin_out = '<option value="' . $current_user->ID . '">' . $current_user->user_login . '</option>';
 
        foreach ( ( $allusers = (array) $_POST['allusers'] ) as $key => $val ) {
                if ( $val != '' && $val != '0' ) {
@@ -45,7 +45,7 @@ function confirm_delete_users( $users ) {
 
                        if ( !empty( $blogs ) ) {
                                ?>
-                               <br /><fieldset><p><legend><?php printf( __( "What should be done with posts owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p>
+                               <br /><fieldset><p><legend><?php printf( __( "What should be done with content owned by %s?" ), '<em>' . $delete_user->user_login . '</em>' ); ?></legend></p>
                                <?php
                                foreach ( (array) $blogs as $key => $details ) {
                                        $blog_users = get_users( array( 'blog_id' => $details->userblog_id, 'fields' => array( 'ID', 'user_login' ) ) );
@@ -65,9 +65,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.' ); ?></label></li>
+                                                       <?php _e( 'Delete all content.' ); ?></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 to:' ) . '</label>' . $user_dropdown; ?></li>
+                                                       <?php echo __( 'Attribute all content to:' ) . '</label>' . $user_dropdown; ?></li>
                                                </ul>
                                                <?php
                                        }
@@ -77,6 +77,9 @@ function confirm_delete_users( $users ) {
                }
        }
 
+       /** This action is documented in wp-admin/users.php */
+       do_action( 'delete_user_form', $current_user );
+
        submit_button( __('Confirm Deletion'), 'delete' );
        ?>
        </form>
@@ -109,7 +112,6 @@ if ( isset( $_GET['action'] ) ) {
                                wp_redirect( network_admin_url( 'users.php' ) );
                        }
                        exit();
-               break;
 
                case 'allusers':
                        if ( !current_user_can( 'manage_network_users' ) )
@@ -135,7 +137,6 @@ if ( isset( $_GET['action'] ) ) {
                                                                echo '</div>';
                                                                require_once( ABSPATH . 'wp-admin/admin-footer.php' );
                                                                exit();
-                                                       break;
 
                                                        case 'spam':
                                                                $user = get_userdata( $val );
@@ -172,7 +173,6 @@ if ( isset( $_GET['action'] ) ) {
                                wp_redirect( $location );
                        }
                        exit();
-               break;
 
                case 'dodelete':
                        check_admin_referer( 'ms-users-delete' );
@@ -208,7 +208,6 @@ if ( isset( $_GET['action'] ) ) {
 
                        wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), network_admin_url( 'users.php' ) ) );
                        exit();
-               break;
        }
 }
 
@@ -241,7 +240,7 @@ get_current_screen()->add_help_tab( array(
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
        '<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Users_Screen" target="_blank">Documentation on Network Users</a>') . '</p>' .
-       '<p>' . __('<a href="http://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+       '<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
 );
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
@@ -289,7 +288,7 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
                <?php $wp_list_table->search_box( __( 'Search Users' ), 'all-user' ); ?>
        </form>
 
-       <form id="form-user-list" action='users.php?action=allusers' method='post'>
+       <form id="form-user-list" action="users.php?action=allusers" method="post">
                <?php $wp_list_table->display(); ?>
        </form>
 </div>