Index: wp-includes/general-template.php
===================================================================
--- wp-includes/general-template.php	(revision 17609)
+++ wp-includes/general-template.php	(working copy)
@@ -149,6 +149,8 @@
  * @param boolean $echo Default to echo and not return the form.
  */
 function get_search_form($echo = true) {
+	$GLOBALS['echo'] = $echo;
+
 	do_action( 'get_search_form' );
 
 	$search_form_template = locate_template('searchform.php');