Changeset 23916

Timestamp:

04/05/2013 12:26:53 AM (13 years ago)

Author:

azaozz

Message:

In the HTML outputted from get_search_form(): remove incrementing the IDs for XHTML after the first call, remove the <div> wrapper for HTML5. Props obenland, props bpetty. Fixes #16539

File:

• trunk/wp-includes/general-template.php (modified) (3 diffs)

trunk/wp-includes/general-template.php

@@ -154 +154 @@
  */
 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' );
@@ -172 +165 @@
         } else {
                 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 = '<form role="search" method="get" class="searchform" action="' . esc_url( home_url( '/' ) ) . '">
+                                <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' ) .'" />
+                        </form>';
+                } else {
+                        $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="text" value="' . get_search_query() . '" name="s" id="s" />
+                                        <input type="submit" id="searchsubmit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
+                                </div>
                         </form>';
                 }
@@ -194 +185 @@
         if ( null === $result )
                 $result = $form;
-
-        $search_form_counter++;
 
         if ( $echo )