Wordpress 4.6

[autoinstalls/wordpress.git] / wp-admin / includes / class-wp-users-list-table.php

diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php
index 9e26867df95fde4151bb833b368d87abb3dcb98e..80720b6c0f07d13f6ef68697dd45f23b0bf74955 100644 (file)
--- a/wp-admin/includes/class-wp-users-list-table.php
+++ b/wp-admin/includes/class-wp-users-list-table.php
@@ -125,7 +125,7 @@ class WP_Users_List_Table extends WP_List_Table {
                        $args['order'] = $_REQUEST['order'];
 
                /**
-                * Filter the query arguments used to retrieve users for the current users list table.
+                * Filters the query arguments used to retrieve users for the current users list table.
                 *
                 * @since 4.4.0
                 *
@@ -160,7 +160,7 @@ class WP_Users_List_Table extends WP_List_Table {
         * with this table.
         *
         * Provides a list of roles and user count for that role for easy
-        * filtering of the user table.
+        * Filtersing of the user table.
         *
         * @since  3.1.0
         * @access protected
@@ -275,8 +275,11 @@ class WP_Users_List_Table extends WP_List_Table {
                 * in the Users list table.
                 *
                 * @since 3.5.0
+                * @since 4.6.0 The `$which` parameter was added.
+                *
+                * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
                 */
-               do_action( 'restrict_manage_users' );
+               do_action( 'restrict_manage_users', $which );
                echo '</div>';
        }
 
@@ -336,7 +339,6 @@ class WP_Users_List_Table extends WP_List_Table {
        protected function get_sortable_columns() {
                $c = array(
                        'username' => 'login',
-                       'name'     => 'name',
                        'email'    => 'email',
                );
 
@@ -412,7 +414,7 @@ class WP_Users_List_Table extends WP_List_Table {
                                $actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( $url."action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . "</a>";
 
                        /**
-                        * Filter the action links displayed under each user in the Users list table.
+                        * Filters the action links displayed under each user in the Users list table.
                         *
                         * @since 2.8.0
                         *
@@ -488,7 +490,7 @@ class WP_Users_List_Table extends WP_List_Table {
                                                break;
                                        default:
                                                /**
-                                                * Filter the display output of custom columns in the Users list table.
+                                                * Filters the display output of custom columns in the Users list table.
                                                 *
                                                 * @since 2.8.0
                                                 *
@@ -547,7 +549,7 @@ class WP_Users_List_Table extends WP_List_Table {
                }
 
                /**
-                * Filter the returned array of roles for a user.
+                * Filters the returned array of roles for a user.
                 *
                 * @since 4.4.0
                 *