Ticket #16539: 16539-6.patch

wp-includes/general-template.php

@@ -151 +151 @@
  * @return string|null String when retrieving, null when displaying or if searchform.php exists.
  */
 function get_search_form( $echo = true, $format = 'xhtml' ) {
+        static $search_form_counter = 0;
+
         do_action( 'get_search_form' );
 
+        // Initialize the values
+        if ( 'html5' === $format ) {
+                $type        = 'search';
+                $placeholder = 'placeholder="' . esc_attr_x( 'Search …', 'placeholder' ) . '" ';
+                $form_id     = '';
+                $submit_id   = '';
+        } else {
+                $type        = 'text';
+                $placeholder = '';
+                $form_id     = $search_form_counter ? '' : ' id="searchform"';
+                $submit_id   = $search_form_counter ? '' : ' id="searchsubmit"';
+        }
+        $text_id = $search_form_counter ? 's-' . $search_form_counter : 's';
+
+        $search_form_counter++;
+
         $search_form_template = locate_template( 'searchform.php' );
         if ( '' != $search_form_template ) {
                 ob_start();
                 require( $search_form_template );
                 $form = ob_get_clean();
         } else {
-                $type        = ( 'html5' === $format ) ? 'search' : 'text';
-                $placeholder = ( 'html5' === $format ) ? 'placeholder="' . esc_attr_x( 'Search …', 'placeholder' ) . '" ' : '';
-
-                $form = '<form role="search" method="get" id="searchform" class="searchform" action="' . esc_url( home_url( '/' ) ) . '">
+                $form = '<form role="search" method="get"' . $form_id . ' class="searchform" action="' . esc_url( home_url( '/' ) ) . '">
                         <div>
-                                <label class="screen-reader-text" for="s">' . _x( 'Search for:', 'label' ) . '</label>
-                                <input type="' . $type . '" ' . $placeholder . 'value="' . get_search_query() . '" name="s" id="s" />
-                                <input type="submit" id="searchsubmit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
+                                <label class="screen-reader-text" for="' . $text_id . '">' . _x( 'Search for:', 'label' ) . '</label>
+                                <input type="' . $type . '" ' . $placeholder . 'value="' . get_search_query() . '" name="s" id="' . $text_id . '" />
+                                <input type="submit"' . $submit_id . ' value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
                         </div>
                 </form>';
         }