From 9e8323d14def7b75bdc383a21adc44a4182c69fc Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Thu, 7 Sep 2006 17:37:26 +0000
Subject: [PATCH] the_search_query() from mdawaffe.  fixes #914

git-svn-id: https://develop.svn.wordpress.org/trunk@4171 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-content/themes/default/searchform.php | 2 +-
 wp-content/themes/default/sidebar.php    | 2 +-
 wp-includes/general-template.php         | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/wp-content/themes/default/searchform.php b/wp-content/themes/default/searchform.php
index c7c73f1737..c6f714035d 100644
--- a/wp-content/themes/default/searchform.php
+++ b/wp-content/themes/default/searchform.php
@@ -1,5 +1,5 @@
 <form method="get" id="searchform" action="<?php bloginfo('home'); ?>/">
-<div><input type="text" value="<?php echo wp_specialchars($s, 1); ?>" name="s" id="s" />
+<div><input type="text" value="<?php the_search_query(); ?>" name="s" id="s" />
 <input type="submit" id="searchsubmit" value="Search" />
 </div>
 </form>
diff --git a/wp-content/themes/default/sidebar.php b/wp-content/themes/default/sidebar.php
index 0ce9b38e3e..948ad25a33 100644
--- a/wp-content/themes/default/sidebar.php
+++ b/wp-content/themes/default/sidebar.php
@@ -30,7 +30,7 @@
 
 		 <?php /* If this is a monthly archive */ } elseif (is_search()) { ?>
 			<p>You have searched the <a href="<?php echo bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives
-			for <strong>'<?php echo wp_specialchars($s); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
+			for <strong>'<?php the_search_query(); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
 
 			<?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
 			<p>You are currently browsing the <a href="<?php echo bloginfo('home'); ?>/"><?php echo bloginfo('name'); ?></a> weblog archives.</p>
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index e1b332b65f..9f168acdf8 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -801,4 +801,9 @@ function the_editor($content, $id = 'content', $prev_id = 'title') {
 	<?php
 }
 
+function the_search_query() {
+	global $s;
+	echo wp_specialchars( stripslashes($s), 1 );
+}
+
 ?>