Ticket #14851: 14851.3.patch

src/wp-includes/general-template.php

@@ -198 +198 @@
  *
  * @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
  * @return string|null String when retrieving, null when displaying or if searchform.php exists.
  */
 function get_search_form( $echo = true ) {
@@ -224 +224 @@
          */
         $format = apply_filters( 'search_form_format', $format );
 
-        $search_form_template = locate_template( 'searchform.php' );
+        $templates = array();
+        $name = $echo;
+        if ( is_string( $name ) ) {
+                $templates[] = "searchform-{$name}.php";
+        }
+        $templates[] = 'searchform.php';
+        $search_form_template = locate_template( $templates );
         if ( '' != $search_form_template ) {
                 ob_start();
                 require( $search_form_template );