From 6509fa203a01a0ef6506344d824ae2a5c488a567 Mon Sep 17 00:00:00 2001
From: scribu <scribu@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 9 Sep 2010 10:20:07 +0000
Subject: [PATCH] Fix MS User search. See #14579

git-svn-id: http://svn.automattic.com/wordpress/trunk@15603 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/default-list-tables.php | 2 ++
 wp-admin/network/users.php                | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/default-list-tables.php b/wp-admin/includes/default-list-tables.php
index cf17387ae7..14ad60a458 100644
--- a/wp-admin/includes/default-list-tables.php
+++ b/wp-admin/includes/default-list-tables.php
@@ -2948,6 +2948,8 @@ class WP_MS_Users_Table extends WP_List_Table {
 	}
 
 	function prepare_items() {
+		global $usersearch;
+
 		$usersearch = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
 
 		$users_per_page = $this->get_items_per_page( 'ms_users_per_page' );
diff --git a/wp-admin/network/users.php b/wp-admin/network/users.php
index 9a97040801..c925ae0842 100644
--- a/wp-admin/network/users.php
+++ b/wp-admin/network/users.php
@@ -63,14 +63,14 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
 	<h2><?php esc_html_e( 'Users' ); ?>
 	<a href="#form-add-user" class="button add-new-h2"><?php echo esc_html_x( 'Add New' , 'users'); ?></a>
 	<?php
-	if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] )
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
+	if ( !empty( $usersearch ) )
+	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) );
 	?>
 	</h2>
 
 	<form action="" method="get" class="search-form">
 		<p class="search-box">
-		<input type="text" name="s" value="<?php echo esc_attr( $s ); ?>" class="search-input" id="user-search-input" />
+		<input type="text" name="s" value="<?php echo esc_attr( $usersearch ); ?>" class="search-input" id="user-search-input" />
 		<input type="submit" id="post-query-submit" value="<?php esc_attr_e( 'Search Users' ) ?>" class="button" />
 		</p>
 	</form>