From 09a2d27d5ed1f0953ec2d3d7a8e20a468eb6fce9 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 19 Dec 2010 01:11:38 +0000
Subject: [PATCH] Remove 'Search Results filter from ms themes. fixes #15872

git-svn-id: http://svn.automattic.com/wordpress/trunk@17050 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../includes/class-wp-ms-themes-list-table.php    | 15 +++++++--------
 wp-admin/network/themes.php                       |  5 ++++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/wp-admin/includes/class-wp-ms-themes-list-table.php b/wp-admin/includes/class-wp-ms-themes-list-table.php
index e6e15d8c88..29c09f9b09 100644
--- a/wp-admin/includes/class-wp-ms-themes-list-table.php
+++ b/wp-admin/includes/class-wp-ms-themes-list-table.php
@@ -204,9 +204,6 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 				case 'upgrade':
 					$text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
 					break;
-				case 'search':
-					$text = _n( 'Search Results <span class="count">(%s)</span>', 'Search Results <span class="count">(%s)</span>', $count );
-					break;
 			}
 
 			if ( $this->is_site_themes )
@@ -214,11 +211,13 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 			else
 				$url = 'themes.php';
 
-			$status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
-				add_query_arg('theme_status', $type, $url),
-				( $type == $status ) ? ' class="current"' : '',
-				sprintf( $text, number_format_i18n( $count ) )
-			);
+			if ( 'search' != $type ) {
+				$status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
+					add_query_arg('theme_status', $type, $url),
+					( $type == $status ) ? ' class="current"' : '',
+					sprintf( $text, number_format_i18n( $count ) )
+				);
+			}
 		}
 
 		return $status_links;
diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php
index b50bc7c9fa..a798e27065 100644
--- a/wp-admin/network/themes.php
+++ b/wp-admin/network/themes.php
@@ -91,7 +91,10 @@ require_once(ABSPATH . 'wp-admin/admin-header.php');
 
 <div class="wrap">
 <?php screen_icon('themes'); ?>
-<h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php } ?></h2>
+<h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
+if ( $s ) 
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?> 
+</h2>
 
 <form method="get" action="">
 <?php $wp_list_table->search_box( __( 'Search Installed Themes' ), 'theme' ); ?>