Ticket #14851: 14851.2.patch

wp-includes/general-template.php

@@ -146 +146 @@
  * search. To give a few examples of what it can be used for.
  *
  * @since 2.7.0
- * @param boolean $echo Default to echo and not return the form.
+ * @param boolean|string $echo Default to echo and not return the form or if string returns the specialised searchform
  * @param string $format Which type to use for the search field. If set to 'html5' it changes to search input type and adds placeholder text.
  * @return string|null String when retrieving, null when displaying or if searchform.php exists.
  */
 function get_search_form( $echo = true, $format = 'xhtml' ) {
         do_action( 'get_search_form' );
 
-        $search_form_template = locate_template( 'searchform.php' );
+        $templates = array();
+        $name = $echo;
+        if ( is_string( $name ) ) {
+                $templates[] = "searchform-{$name}.php";
+                $echo = false;
+        }
+        $templates[] = 'searchform.php';
+        $search_form_template = locate_template( $templates );
         if ( '' != $search_form_template ) {
                 ob_start();
                 require( $search_form_template );