From 29bca3d957fe1df50f59bfc5774300ddffbcd7e6 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Thu, 4 Dec 2008 09:20:52 +0000
Subject: [PATCH] Add search string to H2s, fixes #8373

git-svn-id: https://develop.svn.wordpress.org/trunk@10034 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/categories.php           | 3 ++-
 wp-admin/edit-comments.php        | 3 ++-
 wp-admin/edit-link-categories.php | 3 ++-
 wp-admin/edit-pages.php           | 3 ++-
 wp-admin/edit-tags.php            | 3 ++-
 wp-admin/edit.php                 | 3 ++-
 wp-admin/link-manager.php         | 3 ++-
 wp-admin/upload.php               | 3 ++-
 wp-admin/users.php                | 3 ++-
 9 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index 39157c7be2..7bdc77eb28 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -131,7 +131,8 @@ $messages[5] = __('Category not updated.');
 
 <div class="wrap nosubsub">
 <?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2> 
+<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( stripslashes($_GET['s']) ) ) : ''; ?>
+<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
 
 <?php
 if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index f004e8b328..43445e4e60 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -86,7 +86,8 @@ $search = attribute_escape( $search_dirty ); ?>
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2>
+<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( stripslashes($_GET['s']) ) ) : ''; ?>
+<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
 
 <?php
 if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['spam'] ) ) {
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index 87f0fef98b..b42b7d0aab 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -61,7 +61,8 @@ $messages[6] = __('Categories deleted.'); ?>
 
 <div class="wrap nosubsub">
 <?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2> 
+<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( stripslashes($_GET['s']) ) ) : ''; ?>
+<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
 
 <?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index 6d1f16448e..384d08bfd8 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -104,7 +104,8 @@ require_once('admin-header.php'); ?>
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2>
+<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( get_search_query() ) ) : ''; ?>
+<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
 
 <?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) ) { ?>
 <div id="message" class="updated fade"><p>
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index c957eea779..d1a8072597 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -130,7 +130,8 @@ $messages[6] = __('Tags deleted.'); ?>
 
 <div class="wrap nosubsub">
 <?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2> 
+<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( stripslashes($_GET['s']) ) ) : ''; ?>
+<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
 
 <?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div>
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 5d2fc671f9..2f6424dc6e 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -96,7 +96,8 @@ else
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2>
+<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( get_search_query() ) ) : ''; ?>
+<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
 
 <?php
 if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 3ad7aabd8c..7bc92a3049 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -71,7 +71,8 @@ switch ($order_by) {
 
 <div class="wrap nosubsub">
 <?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2> 
+<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( stripslashes($_GET['s']) ) ) : ''; ?>
+<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
 
 <?php
 if ( isset($_GET['deleted']) ) {
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 017d8fc6cc..e4a107bed0 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -164,7 +164,8 @@ if ( isset($_GET['message']) && (int) $_GET['message'] ) {
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2> 
+<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( get_search_query() ) ) : ''; ?>
+<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
 
 <?php
 if ( isset($message) ) { ?>
diff --git a/wp-admin/users.php b/wp-admin/users.php
index acbeddfb5e..754da1c8f5 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -239,7 +239,8 @@ if ( ! empty($messages) ) {
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2> 
+<?php $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( get_search_query() ) ) : ''; ?>
+<h2><?php echo wp_specialchars( $title ) . $h2_search; ?></h2>
 
 <div class="filter">
 <form id="list-filter" action="" method="get">