From bbe76ccd6e476b1b48f9d6071ff25b0bf6d87fb9 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 2 May 2010 18:10:42 +0000
Subject: [PATCH] Remove Twenty Ten's searchform.php and use the core
 get_search_form() markup. fixes #13053

git-svn-id: http://svn.automattic.com/wordpress/trunk@14331 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyten/searchform.php | 20 --------------------
 wp-includes/general-template.php           |  2 +-
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 wp-content/themes/twentyten/searchform.php

diff --git a/wp-content/themes/twentyten/searchform.php b/wp-content/themes/twentyten/searchform.php
deleted file mode 100644
index 1553c4c2eb..0000000000
--- a/wp-content/themes/twentyten/searchform.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * The Search Form
- *
- * Optional file that allows displaying a custom search form
- * when the get_search_form() template tag is used.
- *
- * @package WordPress
- * @subpackage Twenty Ten
- * @since 3.0.0
- */
-?>
-
-    <form id="searchform" name="searchform" method="get" action="<?php echo home_url(); ?>">
-		<div>
-			<label for="s"><?php _e( 'Search', 'twentyten' ); ?></label>
-			<input type="text" id="s" name="s" />
-			<input type="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'twentyten' ); ?>" />
-		</div>
-    </form>
\ No newline at end of file
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index ac87deddc1..7c27c134b6 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -157,7 +157,7 @@ function get_search_form($echo = true) {
 		return;
 	}
 
-	$form = '<form role="search" method="get" id="searchform" action="' . home_url() . '/" >
+	$form = '<form role="search" method="get" id="searchform" action="' . home_url( '/' ) . '" >
 	<div><label class="screen-reader-text" for="s">' . __('Search for:') . '</label>
 	<input type="text" value="' . get_search_query() . '" name="s" id="s" />
 	<input type="submit" id="searchsubmit" value="'. esc_attr__('Search') .'" />