Index: wp-content/themes/default/searchform.php
===================================================================
--- wp-content/themes/default/searchform.php	(revision 9231)
+++ wp-content/themes/default/searchform.php	(working copy)
@@ -1,12 +0,0 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Default_Theme
- */
-?>
-<form method="get" id="searchform" action="<?php bloginfo('url'); ?>/">
-<label class="hidden" for="s"><?php _e('Search for:'); ?></label>
-<div><input type="text" value="<?php the_search_query(); ?>" name="s" id="s" />
-<input type="submit" id="searchsubmit" value="Search" />
-</div>
-</form>
Index: wp-includes/general-template.php
===================================================================
--- wp-includes/general-template.php	(revision 9226)
+++ wp-includes/general-template.php	(working copy)
@@ -93,6 +93,20 @@
 		load_template( get_theme_root() . '/default/sidebar.php');
 }
 
+function get_search_form() {
+	do_action( 'get_search' );
+	if('' == locate_template(array('searchform.php'), true))
+	{
+		$form = '<form method="get" id="searchform" action="' . get_option('siteurl') . '/" >
+		<label class="hidden" for="s">' . __('Search for:') . '</label>
+		<div><input type="text" value="' . the_search_query() . '" name="s" id="s" />
+		<input type="submit" id="searchsubmit" value="Search" />
+		</div>
+		</form>';
+	}
+	echo apply_filters('get_searchform', $form);
+}
+
 /**
  * Display the Log In/Out link.
  *
Index: wp-includes/widgets.php
===================================================================
--- wp-includes/widgets.php	(revision 9226)
+++ wp-includes/widgets.php	(working copy)
@@ -763,21 +763,11 @@
  */
 function wp_widget_search($args) {
 	extract($args);
-	$searchform_template = get_template_directory() . '/searchform.php';
-
 	echo $before_widget;
 
 	// Use current theme search form if it exists
-	if ( file_exists($searchform_template) ) {
-		include_once($searchform_template);
-	} else { ?>
-		<form id="searchform" method="get" action="<?php bloginfo('url'); ?>/"><div>
-			<label class="hidden" for="s"><?php _e('Search for:'); ?></label>
-			<input type="text" name="s" id="s" size="15" value="<?php the_search_query(); ?>" />
-			<input type="submit" value="<?php echo attribute_escape(__('Search')); ?>" />
-		</div></form>
-	<?php }
-
+	get_search_form();
+	
 	echo $after_widget;
 }