From b453c9e976bad19a2aaebd11d0192ede4cc130ba Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sat, 3 Oct 2015 21:49:24 +0000
Subject: [PATCH] Users: Don't pass the current `WP_Users_List_Table` or
 `WP_MS_Users_List_Table` instance to the `users_list_table_query_args` filter
 after all.

After some discussion, it was decided that Multisite vs single site context can just as easily be derived using available functions like `is_network_admin()`, `get_current_screen()`, etc., rendering the second parameter moot. The hook was introduced in [34796].

Fixes #25360.

Built from https://develop.svn.wordpress.org/trunk@34813


git-svn-id: http://core.svn.wordpress.org/trunk@34778 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-ms-users-list-table.php | 2 +-
 wp-admin/includes/class-wp-users-list-table.php    | 3 +--
 wp-includes/version.php                            | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/class-wp-ms-users-list-table.php b/wp-admin/includes/class-wp-ms-users-list-table.php
index 6a2e47cc00..66a7fe08c6 100644
--- a/wp-admin/includes/class-wp-ms-users-list-table.php
+++ b/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -76,7 +76,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 		$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
 
 		/** This filter is documented in wp-admin/includes/class-wp-users-list-table.php */
-		$args = apply_filters( 'users_list_table_query_args', $args, $this );
+		$args = apply_filters( 'users_list_table_query_args', $args );
 
 		// Query the user IDs for this page
 		$wp_user_search = new WP_User_Query( $args );
diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php
index 93a6b2c5fe..73d2fd30a6 100644
--- a/wp-admin/includes/class-wp-users-list-table.php
+++ b/wp-admin/includes/class-wp-users-list-table.php
@@ -114,9 +114,8 @@ class WP_Users_List_Table extends WP_List_Table {
 		 *
 		 * @param array $args Arguments passed to WP_User_Query to retrieve items for the current
 		 *                    users list table.
-		 * @param mixed $this The current WP_Users_List_Table or WP_MS_Users_List_Table instance.
 		 */
-		$args = apply_filters( 'users_list_table_query_args', $args, $this );
+		$args = apply_filters( 'users_list_table_query_args', $args );
 
 		// Query the user IDs for this page
 		$wp_user_search = new WP_User_Query( $args );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6c1ac9c12f..ae1f838a5f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34812';
+$wp_version = '4.4-alpha-34813';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.