From e8ff44ba966a02d1b543a7a91cc83841032bb9dd Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Tue, 26 Mar 2013 23:18:43 +0000
Subject: [PATCH] In the HTML outputted from get_search_form(): increment the
 ID connecting <label> to <input> when the function is called multiple times,
 remove the form and submit button IDs for HTML 5.0 and for XHTML after the
 first call. Props WraithKenny, fixes #16539

git-svn-id: https://develop.svn.wordpress.org/trunk@23801 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/general-template.php | 37 +++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 17c6416a57..281cc5b8f6 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -153,32 +153,49 @@ function get_template_part( $slug, $name = null ) {
  * @return string|null String when retrieving, null when displaying or if searchform.php exists.
  */
 function get_search_form( $echo = true ) {
+	static $search_form_counter = 0;
+
 	do_action( 'pre_get_search_form' );
 
 	$format = apply_filters( 'search_form_format', 'xhtml' );
 
+	// Initialize the values
+	$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_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 &hellip;', 'placeholder' ) . '" ' : '';
-
-		$form = '<form role="search" method="get" id="searchform" 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' ) .'" />
-			</div>
-		</form>';
+		if ( 'html5' == $format ) {
+			$form = '<form role="search" method="get" class="searchform" action="' . esc_url( home_url( '/' ) ) . '"> 
+				<div> 
+					<label><span class="screen-reader-text">' . _x( 'Search for:', 'label' ) . '</span> 
+						<input type="search" placeholder="' . esc_attr_x( 'Search &hellip;', 'placeholder' ) . '" value="' . get_search_query() . '" name="s" title="' . _x( 'Search for:', 'label' ) . '" /> 
+					</label> 
+					<input type="submit" class="searchsubmit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" /> 
+				</div> 
+			</form>'; 
+		} else { 
+			$form = '<form role="search" method="get"' . $form_id . ' class="searchform" action="' . esc_url( home_url( '/' ) ) . '"> 
+				<div> 
+					<label class="screen-reader-text" for="' . $text_id . '">' . _x( 'Search for:', 'label' ) . '</label> 
+					<input type="text" value="' . get_search_query() . '" name="s" id="' . $text_id . '" /> 
+					<input type="submit"' . $submit_id . ' value="'. esc_attr_x( 'Search', 'submit button' ) .'" /> 
+				</div> 
+			</form>';
+		}
 	}
 
 	$result = apply_filters( 'get_search_form', $form );
 	if ( null === $result )
 		$result = $form;
 
+	$search_form_counter++;
+
 	if ( $echo )
 		echo $result;
 	else