Make WordPress Core

Changeset 23916


Ignore:
Timestamp:
04/05/2013 12:26:53 AM (11 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/general-template.php

    r23882 r23916  
    154154 */
    155155function get_search_form( $echo = true ) {
    156     static $search_form_counter = 0;
    157 
    158156    do_action( 'pre_get_search_form' );
    159157
    160158    $format = apply_filters( 'search_form_format', 'xhtml' );
    161 
    162     // Initialize the values
    163     $form_id   = $search_form_counter ? '' : ' id="searchform"';
    164     $submit_id = $search_form_counter ? '' : ' id="searchsubmit"';
    165     $text_id   = $search_form_counter ? 's-' . $search_form_counter : 's';
    166159
    167160    $search_form_template = locate_template( 'searchform.php' );
     
    172165    } else {
    173166        if ( 'html5' == $format ) {
    174             $form = '<form role="search" method="get" class="searchform" action="' . esc_url( home_url( '/' ) ) . '">
    175                 <div>
    176                     <label><span class="screen-reader-text">' . _x( 'Search for:', 'label' ) . '</span>
    177                         <input type="search" placeholder="' . esc_attr_x( 'Search &hellip;', 'placeholder' ) . '" value="' . get_search_query() . '" name="s" title="' . _x( 'Search for:', 'label' ) . '" />
    178                     </label>
    179                     <input type="submit" class="searchsubmit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
    180                 </div>
    181             </form>';
    182         } else {
    183             $form = '<form role="search" method="get"' . $form_id . ' class="searchform" action="' . esc_url( home_url( '/' ) ) . '">
    184                 <div>
    185                     <label class="screen-reader-text" for="' . $text_id . '">' . _x( 'Search for:', 'label' ) . '</label>
    186                     <input type="text" value="' . get_search_query() . '" name="s" id="' . $text_id . '" />
    187                     <input type="submit"' . $submit_id . ' value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
    188                 </div>
     167            $form = '<form role="search" method="get" class="searchform" action="' . esc_url( home_url( '/' ) ) . '">
     168                <label><span class="screen-reader-text">' . _x( 'Search for:', 'label' ) . '</span>
     169                    <input type="search" placeholder="' . esc_attr_x( 'Search &hellip;', 'placeholder' ) . '" value="' . get_search_query() . '" name="s" title="' . _x( 'Search for:', 'label' ) . '" />
     170                </label>
     171                <input type="submit" class="searchsubmit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
     172            </form>';
     173        } else {
     174            $form = '<form role="search" method="get" id="searchform" class="searchform" action="' . esc_url( home_url( '/' ) ) . '">
     175                <div>
     176                    <label class="screen-reader-text" for="s">' . _x( 'Search for:', 'label' ) . '</label>
     177                    <input type="text" value="' . get_search_query() . '" name="s" id="s" />
     178                    <input type="submit" id="searchsubmit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
     179                </div>
    189180            </form>';
    190181        }
     
    194185    if ( null === $result )
    195186        $result = $form;
    196 
    197     $search_form_counter++;
    198187
    199188    if ( $echo )
Note: See TracChangeset for help on using the changeset viewer.