Ticket #16541: 16541.diff

wp-includes/general-template.php

@@ -153 +153 @@
 
         $search_form_template = locate_template('searchform.php');
         if ( '' != $search_form_template ) {
-                require($search_form_template);
-                return;
+                if ( !$echo ) {
+                        ob_start();
+                        require($search_form_template);
+                        return ob_get_clean();
+                }
+                else {
+                        require($search_form_template);
+                        return;
+                }
         }
 
         $form = '<form role="search" method="get" id="searchform" action="' . home_url( '/' ) . '" >